Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/router.py =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/router.py (revision 39323) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/router.py (working copy) @@ -15,6 +15,13 @@ from apv.company import * import re import time +from hive.node import AppNode +from hive.utils import get_system_info, get_current_lang +from hive.lang import get_langs_info +from djproject.an_settings import THEMES +from django.utils.translation import ugettext_lazy as _ +# Available user manual to choose from +MANUAL = [(_('Application Guide'),'app'), (_('CLI Handbook'), 'cli')] lruCache = LRUCacheDict(max_size=10000) reader = database.Reader('/ca/webui/conf/GeoLite2-City.mmdb') @@ -801,3 +808,28 @@ response['Content-Type'] = 'text/plain; charset=utf-8' response['Content-Disposition'] = 'attachment; filename=%s' % file_name return response + +def get_geneve_page(request): + andebug("hive.debug", "get_geneve_page") + env = HiveEnvironment(loader=ChoiceLoader([ + PackageLoader('apv', 'templates'), + PackageLoader('hive', 'templates')])) + template = env.get_template("/network/interface/geneve_interface/interface.html") + ctx = context_for_model(request) + response = HttpResponse(template.render(ctx)) + return response + +def context_for_model(request): + sess = get_current_session() + app_node = AppNode.get_app('apv') + django_ctx = RequestContext(request) + login_check_data = False + if sess.is_login_check(): + sess.disable_login_check() + login_check_data = True + system_info = get_system_info() + ha_info = get_ha_info() + return {'NODE':app_node, 'REQUEST':request, 'SESSION':sess, 'LOGIN_CHECK':login_check_data, 'SYS_INFO':system_info, 'HA_INFO':ha_info, + 'LANGUAGE_CODE':django_ctx['LANGUAGE_CODE'], 'LANGS':get_langs_info(), 'TRADEMASK':COMPANY_TRADEMASK, 'app_name': PRODUCT_KEYWORD, + 'MEDIA':'/media/', 'APPNODE':AppNode.get_app('apv'),'COPYRIGHT':COMPANY_COPYRIGHT[get_current_lang()],'COPYRIGHT_CN':COMPANY_COPYRIGHT_CN[get_current_lang()], + 'csrf_token':django_ctx['csrf_token'], 'THEMES':THEMES, 'PARAMS':{}, 'MANUAL':MANUAL} Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/network/interface/geneve_interface/interface.html =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/network/interface/geneve_interface/interface.html (revision 0) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/network/interface/geneve_interface/interface.html (working copy) @@ -0,0 +1,1307 @@ +{% extends "page_model.html" %} + +{% block content %} +
+
+
+ +
+ +
+ + +
+
+
+
+ + +
+
+
+
+ +
+
+ +
+ + + +
+
+
+ +
+
+
+
+ +
+
+ Tunnel Binding +
+
+
+
+ +
+
+
+ + +
+ + +
+
+
+
+
+ + + + + + + + + +
ID{% trans %}Tunnel Name{% endtrans %}{% trans %}Local IP{% endtrans %}{% trans %}Remote IP{% endtrans %}
+
+
+
+
+
+
+
+ +
+
+
+ + +
+ + +
+
+
+
+
+ + + + + + + + + + + +
ID{% trans %}MAC{% endtrans %}{% trans %}GTEP-IP{% endtrans %}{% trans %}VLAN{% endtrans %}{% trans %}Type{% endtrans %}{% trans %}Location{% endtrans %}
+
+
+ + +
+
+ × +
+
+
+
+ +
+ +
+
Bind GENEVE Tunnel for {[urlParams.title]}
+ +
+
+
+
+ +
+
+ +
+ + + +
+
+
+ +
+
+
+
+
+ + +
+
+
+
+
+ + + +
+
+ × +
+
+
+
+ +
+ +
+
New GENEVE Forwarding Entry
+ +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ + +
+
+
+
+
+ +
+
+ + +{% endblock %} \ No newline at end of file Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/network/interface/geneve_interface/list.html =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/network/interface/geneve_interface/list.html (revision 0) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/network/interface/geneve_interface/list.html (working copy) @@ -0,0 +1,1030 @@ +{% extends "page_model.html" %} +{% block list_active %}class="active"{% endblock %} +{% block frame_name %}frame_model_list{% endblock %} + +{% block frame_model_main %} +
+ +
+
+
+
+ + +
+
+
+ + +
+
+ +
+ (0-65535) +
+
+
+
+ +
+
+ Interface Settings +
+
+
+
+ +
+
+
+ + + +
+
+
+
+ + + + + + + + +
ID{% trans %}Interface Name{% endtrans %}{% trans %}VNI{% endtrans %}
+
+ +
+
+ Tunnel Settings +
+
+
+
+ +
+
+
+ + + +
+
+
+
+ + + + + + + + + +
ID{% trans %}Tunnel Name{% endtrans %}{% trans %}Local IP{% endtrans %}{% trans %}Remote IP{% endtrans %}
+
+
+
+
+
+ + +
+
+
+
+
+
+
    +
    • +
    • +
+ 
{[ geneve_con_text ]}
+
+
+
+
+
+ +
+
+ × +
+
+
+
+ +
+ +
+
New GENEVE interface
+ +
+
+
+
+ +
+ +
+
+ {[ addGeneveNameError ]} +
+
+
+ +
+ + (1 to 32768) +
+
+ {[ addGeneveVniError ]} +
+
+
+
+ + +
+
+
+
+
+ + +
+
+ × +
+
+
+
+ +
+ +
+
New GENEVE Tunnel
+ +
+
+
+
+ +
+ +
+
+
+ +
+ + +
+
+ +
+
+
+ +
+ + +
+
+ +
+
+
+
+ + +
+
+
+
+
+ +
+
+ + + +{% endblock %} \ No newline at end of file Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/tree.py =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/tree.py (revision 39323) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/tree.py (working copy) @@ -222,6 +222,7 @@ ('network', {'cls':MenuNode, 'verbose_name':_('Network'), 'icon':'fa-cloud', 'sub_nodes':D([ ('interface', {'cls':MenuNode, 'verbose_name':_('Interface Settings'),'sub_nodes':D([ ('sys_interface', {'cls':ModelNode, 'model':'network.interface.SystemInterface'}), + ('geneve_interface', {'cls':ModelNode, 'model':'network.geneve.Interface'}), ('bond_interface', {'cls':ModelNode, 'model':'network.interface.BondInterface'}), ('vlan_interface', {'cls':ModelNode, 'model':'network.interface.VlanInterface'}), ('vxlan_interface', {'cls':ModelNode, 'model':'network.vxlan.VXLANSetting'}), Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/urls.py =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/urls.py (revision 39323) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/urls.py (working copy) @@ -60,4 +60,5 @@ url(r'^%s/%s/get_top_chart_data$' % (PRODUCT_KEYWORD, C_PATH_GSLB), get_top_chart_data), url(r'^%s/%s/get_hits_chart_data$' % (PRODUCT_KEYWORD, C_PATH_GSLB), get_hits_chart_data), url(r'^%s/network/geneve/download' % PRODUCT_KEYWORD, geneve_log_download), + url(r'^%s/get_geneve_page$' % PRODUCT_KEYWORD, get_geneve_page), )