Index: /branches/rel_apv_10_7/usr/click/lib/libca_snmp/snmp_cadmin.c =================================================================== --- /branches/rel_apv_10_7/usr/click/lib/libca_snmp/snmp_cadmin.c (revision 39870) +++ /branches/rel_apv_10_7/usr/click/lib/libca_snmp/snmp_cadmin.c (working copy) @@ -1861,6 +1861,11 @@ snmp_server_unlock(); return CA_ERR_SNMP_INVAL; } + if (port != 161 && port != 162) { + printf("Invalid port number. It can only be 161 or 162.\n"); + snmp_server_unlock(); + return CA_ERR_SNMP_INVAL; + } trap_ver = pInfo->host[i].snmp_version; if (trap_ver == 3) { if (engine_id_len < 1) { @@ -2002,7 +2007,9 @@ } } else { /* snmpv1 or snmpv2c update auth_protocol and priv_protocol */ - printf("Warning: This command only applicable for SNMP trap version v3!"); + if (strcmp(engine_id, pInfo->host[i].auth_eng_id) != 0) { + printf("Warning: Only SNMPv3 traps support changing the Engine ID."); + } strncpy(auth_protocol, "", ENCRYPTSTR_LEN); strncpy(priv_protocol, "", ENCRYPTSTR_LEN); } Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/admintools/snmp/__init__.py =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/admintools/snmp/__init__.py (revision 39870) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/admintools/snmp/__init__.py (working copy) @@ -243,6 +243,7 @@ ('v3','V3'), ), primary_key=True) ip = IPAddressField(verbose_name='IP', primary_key=True) + port = PortField(verbose_name=_('Host Port'), default=162, optional=True, editable=True) class Meta: abstract = True @@ -393,17 +394,18 @@ # version 1 or 2 data['engine_id'] = '' data['auth_password'] = '' - data['level'] = '' + data['level'] = '""' data['priv_password'] = '' auth_param = " ".join(auth_data) result = cli.cmd('snmp auth {cli_param}'.format(cli_param=auth_param).strip() % data, RegexParser("the length of authoritative engine id for SNMPv3 can't be odd number", match_msg=__("The length of Authoritative Engine ID for SNMPv3 cannot be an odd number."), match_exception=CLICmdWarning, exclusive=True), - BlankParser(nonblank_exception=CLICmdError, supplement=True, ignore_msg=["Warning: This command only applicable for SNMP trap version v3!"])) + BlankParser(nonblank_exception=CLICmdError, supplement=True, ignore_msg=[ + "Warning: This command only applicable for SNMP trap version v3!", + "Warning: Only SNMPv3 traps support changing the Engine ID."])) return result class SNMPV1V2Servers(Server): type = DerivedField(value='v1v2') - port = PortField(verbose_name=_('Host Port'), default=162, optional=True) version_id = EnumField(verbose_name='Version ID',values=( ('1', '1'), ('2', '2'), @@ -427,12 +429,15 @@ result = server_manager.insert_by_version(self.cli, instance) return result - + def _update(self, instance): + self.cli.set_config() + server_manager = Server.get_manager(self._session) + result = server_manager.update_by_version(self.cli, instance) + return result class SNMPV3Servers(Server): type = DerivedField(value='v3') - port = PortField(verbose_name=_('Host Port'), default=162, optional=True, editable=True) engine_id = CharField(verbose_name='Engine ID', length='0..32', optional=True, editable=True) username = CharField(verbose_name='User Name') level = EnumField(verbose_name='Security Level',values=( Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/admintools/snmp/SNMPV1V2Servers/box_instance_config.html =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/admintools/snmp/SNMPV1V2Servers/box_instance_config.html (revision 0) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/admintools/snmp/SNMPV1V2Servers/box_instance_config.html (working copy) @@ -0,0 +1,384 @@ +{# Required Context Variables: MODEL, MANAGER, OBJECT #} +{% extends "box.html" %} + +{% block box_content %} +{% import "widgets/form.html" as form %} +{% import "widgets/action.html" as Action %} +{% set field_group=MODEL._meta.field_groups[PARAMS['group_name']] %} +
+
+ +
+

+ {% if MODEL._meta.profile %} + {% if not field_group or field_group.name == 'default' %} + {{ MODEL._meta.verbose_name | truncate(30, True) }} + {% else %} + {{ MODEL._meta.verbose_name | truncate(30, True) }} - {{ field_group.verbose_name | truncate(30, True) }} + {% endif %} + {% else %} + {% if field_group %} + {{ OBJECT.repr() | truncate(30, True) }} - {{ field_group.verbose_name | truncate(30, True) }} + {% else %} + {{ OBJECT.repr() | truncate(30, True) }} + {% endif %} + {% endif %} +

+
+
+
+ + {% if field_group %} +
+
+
+
+ {% for action in field_group.related_actions(OBJECT) if not (SESSION.is_segment_user and action.seg_hidden) %} + {{ Action.ActionWidget(action.name, action) }} + {% endfor %} +
+ {% for field in field_group.fields if field.visible_in_edit() and not field.is_external_component() and not (SESSION.is_segment_user and field.seg_hidden) and not (field.is_unprivileged and SESSION.is_unprivileged_role) %} + {% set context_of_field = (PARAMS.get("context", {})|url2obj).get(field.name, None) %} + {% if context_of_field != None %} + {{ field.static_widget(manager=MANAGER, context_value=context_of_field[0], context_repr=context_of_field[1]).render(form, 'js_hook_'+id|jsvar, {'form':form, 'csrf_token':csrf_token}) }} + {% else %} + {{ field.default_widget(editable=field.editable, model_instance=OBJECT, manager=MANAGER).render(form, 'js_hook_'+id|jsvar, {'form':form, 'csrf_token':csrf_token, 'session':SESSION}) }} + {% endif %} + {% endfor %} +
+
+
+ {% else %} + {% set group_num=MODEL._meta.field_groups|length %} + {% for group_name, each_field_group in MODEL._meta.field_groups.iteritems() if each_field_group.visible_in_edit(OBJECT) and not (SESSION.is_segment_user and each_field_group.seg_hidden) %} + {% set has_fields={"bool":false} %} + {% for field in each_field_group.fields if field.visible_in_edit() and not field.hide_in_popup_edit and not field.is_external_component() and not (SESSION.is_segment_user and field.seg_hidden) %} + {% if field.name %} + {% if has_fields.update({"bool":true}) %}{% endif %} + {% endif %} + {% endfor %} +
+
+ {% if each_field_group.verbose_name and group_num > 1 %} + + {% if has_fields.bool %} + {{ each_field_group.verbose_name }} + {% endif %} + {% endif %} +
+
+ {% for action in each_field_group.related_actions(OBJECT) %} + {% if not action.edit_hidden %} + {{ Action.ActionWidget(action.name, action) }} + {% endif %} + {% endfor %} +
+ {% for field in each_field_group.fields if field.visible_in_edit() and not field.hide_in_popup_edit and not field.is_external_component() and not (SESSION.is_segment_user and field.seg_hidden) %} + {% set context_of_field = (PARAMS.get("context", {})|url2obj).get(field.name, None) %} + {% if context_of_field != None %} + {{ field.static_widget(manager=MANAGER, context_value=context_of_field[0], context_repr=context_of_field[1]).render(form, 'js_hook_'+id|jsvar, {'form':form, 'csrf_token':csrf_token}) }} + {% else %} + {{ field.default_widget(editable=field.editable, model_instance=OBJECT, manager=MANAGER).render(form, 'js_hook_'+id|jsvar, {'form':form, 'csrf_token':csrf_token,'session':SESSION}) }} + {% endif %} + {% endfor %} +
+
+
+ {% endfor %} + {% endif %} + +
+
+{% endblock box_content %} + +{% block box_script %} +{% if 0 %} + +{% endif %} +{% endblock %} Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/admintools/snmp/SNMPV3Servers/box_instance_config.html =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/admintools/snmp/SNMPV3Servers/box_instance_config.html (revision 0) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/admintools/snmp/SNMPV3Servers/box_instance_config.html (working copy) @@ -0,0 +1,384 @@ +{# Required Context Variables: MODEL, MANAGER, OBJECT #} +{% extends "box.html" %} + +{% block box_content %} +{% import "widgets/form.html" as form %} +{% import "widgets/action.html" as Action %} +{% set field_group=MODEL._meta.field_groups[PARAMS['group_name']] %} +
+
+ +
+

+ {% if MODEL._meta.profile %} + {% if not field_group or field_group.name == 'default' %} + {{ MODEL._meta.verbose_name | truncate(30, True) }} + {% else %} + {{ MODEL._meta.verbose_name | truncate(30, True) }} - {{ field_group.verbose_name | truncate(30, True) }} + {% endif %} + {% else %} + {% if field_group %} + {{ OBJECT.repr() | truncate(30, True) }} - {{ field_group.verbose_name | truncate(30, True) }} + {% else %} + {{ OBJECT.repr() | truncate(30, True) }} + {% endif %} + {% endif %} +

+
+
+
+ + {% if field_group %} +
+
+
+
+ {% for action in field_group.related_actions(OBJECT) if not (SESSION.is_segment_user and action.seg_hidden) %} + {{ Action.ActionWidget(action.name, action) }} + {% endfor %} +
+ {% for field in field_group.fields if field.visible_in_edit() and not field.is_external_component() and not (SESSION.is_segment_user and field.seg_hidden) and not (field.is_unprivileged and SESSION.is_unprivileged_role) %} + {% set context_of_field = (PARAMS.get("context", {})|url2obj).get(field.name, None) %} + {% if context_of_field != None %} + {{ field.static_widget(manager=MANAGER, context_value=context_of_field[0], context_repr=context_of_field[1]).render(form, 'js_hook_'+id|jsvar, {'form':form, 'csrf_token':csrf_token}) }} + {% else %} + {{ field.default_widget(editable=field.editable, model_instance=OBJECT, manager=MANAGER).render(form, 'js_hook_'+id|jsvar, {'form':form, 'csrf_token':csrf_token, 'session':SESSION}) }} + {% endif %} + {% endfor %} +
+
+
+ {% else %} + {% set group_num=MODEL._meta.field_groups|length %} + {% for group_name, each_field_group in MODEL._meta.field_groups.iteritems() if each_field_group.visible_in_edit(OBJECT) and not (SESSION.is_segment_user and each_field_group.seg_hidden) %} + {% set has_fields={"bool":false} %} + {% for field in each_field_group.fields if field.visible_in_edit() and not field.hide_in_popup_edit and not field.is_external_component() and not (SESSION.is_segment_user and field.seg_hidden) %} + {% if field.name %} + {% if has_fields.update({"bool":true}) %}{% endif %} + {% endif %} + {% endfor %} +
+
+ {% if each_field_group.verbose_name and group_num > 1 %} + + {% if has_fields.bool %} + {{ each_field_group.verbose_name }} + {% endif %} + {% endif %} +
+
+ {% for action in each_field_group.related_actions(OBJECT) %} + {% if not action.edit_hidden %} + {{ Action.ActionWidget(action.name, action) }} + {% endif %} + {% endfor %} +
+ {% for field in each_field_group.fields if field.visible_in_edit() and not field.hide_in_popup_edit and not field.is_external_component() and not (SESSION.is_segment_user and field.seg_hidden) %} + {% set context_of_field = (PARAMS.get("context", {})|url2obj).get(field.name, None) %} + {% if context_of_field != None %} + {{ field.static_widget(manager=MANAGER, context_value=context_of_field[0], context_repr=context_of_field[1]).render(form, 'js_hook_'+id|jsvar, {'form':form, 'csrf_token':csrf_token}) }} + {% else %} + {{ field.default_widget(editable=field.editable, model_instance=OBJECT, manager=MANAGER).render(form, 'js_hook_'+id|jsvar, {'form':form, 'csrf_token':csrf_token,'session':SESSION}) }} + {% endif %} + {% endfor %} +
+
+
+ {% endfor %} + {% endif %} + +
+
+{% endblock box_content %} + +{% block box_script %} +{% if 0 %} + +{% endif %} +{% endblock %} Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/admintools/snmp/Server/box_model_add_wizard.html =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/admintools/snmp/Server/box_model_add_wizard.html (revision 0) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/admintools/snmp/Server/box_model_add_wizard.html (working copy) @@ -0,0 +1,225 @@ +{# Required Context Variables: MODEL, MANAGER, [CONCRETE_MODEL, CONCRETE_MANAGER] + This implements a wizard for adding an instance for a model +#} +{% extends "box.html" %} + +{% block custom_box_class %}box-model-add modal-content{% endblock %} + +{% block box_content %} +{% import "widgets/form.html" as form %} + +{% if CONCRETE_MODEL %} + {% set CURRENT_MODEL = CONCRETE_MODEL %} +{% else %} + {% set CURRENT_MODEL = MODEL %} +{% endif %} + +
+
+ +
+

{{ gettext('New %s')%CURRENT_MODEL._meta.verbose_name }}

+
+
+ + +
+
+ {% for field_group in CURRENT_MODEL._meta.field_groups.values() %} + {% if field_group.isbasic %} +
+
+
+ {% if CURRENT_MODEL._meta.abstract %} + {% for field in field_group.fields %} + {% if field.name in CURRENT_MODEL._meta.all_deriving_fields and field.visible_in_add() and not (SESSION.is_segment_user and field.seg_hidden) %} + {{ field.default_widget().render(form, 'js_hook_'+id|jsvar, {'abstract':True, 'form':form,'csrf_token':csrf_token,'CURRENT_MODEL':CURRENT_MODEL}) }} + {% endif %} + {% endfor %} + {% else %} + {% for field in field_group.fields %} + {% if field.visible_in_add() and not (SESSION.is_segment_user and field.seg_hidden) %} + {% set context_of_field = (PARAMS.get("context", {})|url2obj).get(field.name, None) %} + {% set concrete_initial_value = (PARAMS.get("concrete", {})|url2obj).get(field.name, None) %} + {% if context_of_field != None %} + {{ field.static_widget(manager=MANAGER, context_value=context_of_field[0], context_repr=context_of_field[1]).render(form, 'js_hook_'+id|jsvar, {'form':form,'csrf_token':csrf_token}) }} + {% else %} + {% set editable = True %} + {{ field.default_widget(editable=editable, initial_value=concrete_initial_value).render(form, 'js_hook_'+id|jsvar, {'form':form,'csrf_token':csrf_token}) }} + {% endif %} + {% endif %} + {% endfor %} + {% endif %} +
+
+
+ {% endif %} + {% endfor %} +
+
+ {% if not CURRENT_MODEL._meta.abstract and CURRENT_MODEL._meta.addable %} + + {% endif %} + +
+
+
+{% endblock box_content %} + +{% block box_script %} + +{% if CONCRETE_MODEL %} + {% set CURRENT_MODEL = CONCRETE_MODEL %} +{% else %} + {% set CURRENT_MODEL = MODEL %} +{% endif %} +{% if 0 %} + +{% endif %} +{% endblock box_script %} Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/snmp_trap_host.html =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/snmp_trap_host.html (revision 0) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/snmp_trap_host.html (working copy) @@ -0,0 +1,77 @@ +// isEditPage is true if this is used on an edit page, false otherwise +// Please include this template within a function scope where isEditPage is defined +var portWidget = box.form_fields && box.form_fields['port']; +if (!portWidget) return; + +var widgetEle = $("#" + portWidget.widget.id); +var input = widgetEle.find("input"); + +var showSaveChanges = function(){ + try { + // Run the same side-effects as the form:changed listener so Save Changes appears + $HIVE.check_form_condition(box, field_group_dict, group_condition_dict, field_condition_dict); + if (_.indexOf(box.changed_fields, portWidget) == -1) { + box.changed_fields.push(portWidget); + } + box.$el.find(".btn-static").fadeIn("slow"); + if ($(".btn-static").is(":visible")) { + var buttonH = $(".btn-static").offset().top; + $(function(){ + $(window).off('scroll.box_static'); + $(window).on('scroll.box_static', function(){ + var scrollH = $(this).scrollTop(); + if (scrollH >= buttonH) { + $(".btn-switch").addClass("btn-fixed"); + } else { + $(".btn-switch").removeClass("btn-fixed"); + } + }); + }); + } + } catch (e) { + try { portWidget.trigger && portWidget.trigger('form:changed'); } catch (e2) {} + } +}; + +input.on("input", function(){ + var val = $(this).val(); + var n = parseInt(val, 10); + if (isNaN(n) || (n !== 161 && n !== 162)) { + widgetEle.find(".error-info").html(interpolate("{{ gettext('The value should be %s or %s.') }}", [161, 162])); + widgetEle.find(".error-info").show(); + widgetEle.find(".error-sign").show(); + } else { + widgetEle.find(".error-info").html(""); + widgetEle.find(".error-info").hide(); + widgetEle.find(".error-sign").hide(); + } + if (isEditPage) { + // notify the form that this widget changed so the Save Changes button appears + showSaveChanges(); + } +}); +if (isEditPage) { + // also show Save Changes on focus or click (user requested click to show) + input.on('focus click', function(){ + showSaveChanges(); + }); +} + +// Make inline input handler show immediate feedback, but avoid duplicate +// messages in the submit alert. Use validate() as the single canonical +// final check and make validate_on_blur a noop so submit loop won't +// append the same error twice (submit calls both validate and +// validate_on_blur). +portWidget.validate_on_blur = function(){ + return [true, ""]; // no-op for blur (inline handler already shows message) +}; + +// final validation used at submit time +portWidget.validate = function(){ + var val = portWidget.get_value(); + var n = parseInt(val, 10); + if (isNaN(n) || (n !== 161 && n !== 162)) { + return [false, interpolate("{{ gettext('The value should be %s or %s.') }}", [161, 162])]; + } + return [true, ""]; +}; Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/en/LC_MESSAGES/django.po =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/en/LC_MESSAGES/django.po (revision 39870) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/en/LC_MESSAGES/django.po (working copy) @@ -5423,6 +5423,9 @@ msgid "The value should between %s to %s." msgstr "" +msgid "The value should be %s or %s." +msgstr "" + #: apv/models/loadbalancing/slb/vs/http/global/cache.py:156 msgid "" "The value of the expiration time has exceeded the maximum value " Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/ja/LC_MESSAGES/django.po =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/ja/LC_MESSAGES/django.po (revision 39870) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/ja/LC_MESSAGES/django.po (working copy) @@ -5606,6 +5606,9 @@ msgid "The value should between %s to %s." msgstr "値は%sと%sの間でなければなりません" +msgid "The value should be %s or %s." +msgstr "値は%sまたは%sである必要があります" + #: apv/models/loadbalancing/slb/vs/http/global/cache.py:156 msgid "" "The value of the expiration time has exceeded the maximum value " Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/zh_CN/LC_MESSAGES/django.po =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/zh_CN/LC_MESSAGES/django.po (revision 39870) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/zh_CN/LC_MESSAGES/django.po (working copy) @@ -5588,6 +5588,9 @@ msgid "The value should between %s to %s." msgstr "该值应介于%s和%s之间" +msgid "The value should be %s or %s." +msgstr "该值应为%s或%s" + #: apv/models/loadbalancing/slb/vs/http/global/cache.py:156 msgid "" "The value of the expiration time has exceeded the maximum value " Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/zh_TW/LC_MESSAGES/django.po =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/zh_TW/LC_MESSAGES/django.po (revision 39870) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/zh_TW/LC_MESSAGES/django.po (working copy) @@ -5588,6 +5588,9 @@ msgid "The value should between %s to %s." msgstr "該值應介於%s和%s之間" +msgid "The value should be %s or %s." +msgstr "該值應為%s或%s" + #: apv/models/loadbalancing/slb/vs/http/global/cache.py:156 msgid "" "The value of the expiration time has exceeded the maximum value "