Skip to content

Commit

Permalink
Closes-Bug: #1456453 - Give an option to enable/disable SNMP when add…
Browse files Browse the repository at this point in the history 
…ing/editing

the PRouter as a Physical Router.
Also when the Junos Service Ports checkbox is disabled remove the ports from
config.

Change-Id: Icc2b09a8cd8084d41702fadd1541e817a4d38654
  • Loading branch information
@manojgn
manojgn committed May 19, 2015
1 parent 08ea637 commit fa80cbe
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 54 deletions.
16 changes: 11 additions & 5 deletions webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,12 +642,12 @@ function physicalRoutersConfig() {
}
}
if(gblSelRow.isSNMPManaged){
if(currAddEditType != PROUTER_SUFFIX && currAddEditType != VCPE_SUFFIX){
if(currAddEditType != VCPE_SUFFIX){
$('#chkSnmpSettings' + currAddEditType)[0].checked = true;
$('#snmpSettings' + currAddEditType).removeClass('hide').addClass('show');
}
} else {
if(currAddEditType != PROUTER_SUFFIX && currAddEditType != VCPE_SUFFIX){
if(currAddEditType != VCPE_SUFFIX){
$('#chkSnmpSettings' + currAddEditType)[0].checked = false;
$('#snmpSettings' + currAddEditType).removeClass('show').addClass('hide');
}
Expand Down Expand Up @@ -802,7 +802,7 @@ function physicalRoutersConfig() {
servicePorts.push(servicePort);
}
}
}
}
}
if(currAddEditType == PROUTER_SUFFIX) {
bgpRouter = $("#ddBgpRouter" + currAddEditType).data('contrailDropdown').text();
Expand Down Expand Up @@ -834,7 +834,9 @@ function physicalRoutersConfig() {
if(servicePorts != null && servicePorts.length > 0){
postObject["physical-router"]["physical_router_junos_service_ports"] = {};
postObject["physical-router"]["physical_router_junos_service_ports"]["service_port"] = servicePorts;
}
} else {
postObject["physical-router"]["physical_router_junos_service_ports"] = {};
}
if(bgpRouter != null && bgpRouter != 'None'){
var bgpRouterRefs = [{"to":["default-domain", "default-project" , "ip-fabric", "__default__", bgpRouter]}];
postObject["physical-router"]["bgp_router_refs"] = bgpRouterRefs;
Expand Down Expand Up @@ -884,7 +886,7 @@ function physicalRoutersConfig() {
isSNMPManaged = $('#chkSnmpSettings' + currAddEditType)[0].checked;
}
//SNMP Credentials
if(currAddEditType == PROUTER_SUFFIX || isSNMPManaged) {
if(isSNMPManaged) {
var snmpVersion = ($('#snmpVersion2' + currAddEditType).is(':checked') == true)? 2 : 3;
var snmpLocalPort = ($("#txtLocalPort" + currAddEditType).val().trim() != '')? parseInt($("#txtLocalPort" + currAddEditType).val().trim()) : '';
var snmpRetries = ($("#txtRetries" + currAddEditType).val().trim() != '')? parseInt($("#txtRetries" + currAddEditType).val().trim()) : '';
Expand Down Expand Up @@ -926,6 +928,10 @@ function physicalRoutersConfig() {
if($("#txtV3EngineTime" + currAddEditType).val().trim() != '')
postObject["physical-router"]['physical_router_snmp_credentials']['v3_engine_time'] = parseInt($("#txtV3EngineTime" + currAddEditType).val().trim());
}
} else {
if($('#chkSnmpSettings' + currAddEditType).length > 0) {
postObject["physical-router"]['physical_router_snmp_credentials'] = {};
}
}
if(methodType == "PUT"){
doAjaxCall(url, methodType, JSON.stringify(postObject), 'successHandlerForPhysicalRouterAddEdit', 'failureHandlerForCreateEditRouters', null, null);
Expand Down
84 changes: 35 additions & 49 deletions webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,55 +40,32 @@
<div class="span2"><label>Associated Virtual Router(s)</label></div>
<div class="span10">{{displayVirtualRouters}}</div>
</div>
{{/IfCompare}}
{{#IfCompare pRouterEditType '_Netconf' operator='=='}}
<div class="row-fluid">
<label class="details-group-heading">Netconf Settings</label>
</div>
<div class="row-fluid">
<div class="span2"><label>Username</label></div>
<div class="span10">{{username}}</div>
</div>
<div class="row-fluid">
<div class="span2"><label>BGP Gateway</label></div>
<div class="span10">{{bgp_routers}}</div>
</div>
<div class="row-fluid">
<div class="span2"><label>Auto Configuration</label></div>
<div class="span10">{{auto_config}}</div>
</div>
<div class="row-fluid">
<div class="span2"><label>Virtual Networks</label></div>
<div class="span10">{{virtual_networks}}</div>
</div>
{{#IfCompare junosServicePorts '-' operator='!='}}
<div class="row-fluid">
<div class="span2"><label>Junos Service Ports</label></div>
<div class="span10">{{junosServicePorts}}</div>
</div>
{{/IfCompare}}
{{/IfCompare}}
{{#IfCompare pRouterEditType '_PRouter' operator='=='}}
<div class="row-fluid">
<label class="details-group-heading">Netconf Settings</label>
</div>
<div class="row-fluid">
<div class="span2"><label>Username</label></div>
<div class="span10">{{username}}</div>
</div>
<div class="row-fluid">
<div class="span2"><label>BGP Gateway</label></div>
<div class="span10">{{bgp_routers}}</div>
</div>
<div class="row-fluid">
<div class="span2"><label>Auto Configuration</label></div>
<div class="span10">{{auto_config}}</div>
</div>
<div class="row-fluid">
<label class="details-group-heading">Netconf Settings</label>
</div>
<div class="row-fluid">
<div class="span2"><label>Username</label></div>
<div class="span10">{{username}}</div>
</div>
<div class="row-fluid">
<div class="span2"><label>BGP Gateway</label></div>
<div class="span10">{{bgp_routers}}</div>
</div>
<div class="row-fluid">
<div class="span2"><label>Auto Configuration</label></div>
<div class="span10">{{auto_config}}</div>
</div>
<div class="row-fluid">
<div class="span2"><label>Virtual Networks</label></div>
<div class="span10">{{virtual_networks}}</div>
</div>
{{#IfCompare junosServicePorts '-' operator='!='}}
<div class="row-fluid">
<div class="span2"><label>Virtual Networks</label></div>
<div class="span10">{{virtual_networks}}</div>
<div class="span2"><label>Junos Service Ports</label></div>
<div class="span10">{{junosServicePorts}}</div>
</div>
{{/IfCompare}}
{{/IfCompare}}
{{#IfCompare isSNMPManaged true operator='=='}}
<div class="row-fluid">
<label class="details-group-heading">SNMP Settings</label></div>
Expand Down Expand Up @@ -446,14 +423,23 @@
</div>
</div>
</div> <!-- BGP router widget -->
<div class="widget-box transparent collapsed">
<div class="control-group">
<label class="control-label" >SNMP Monitored</label>
<div class="pull-left margin-left-21 padding-top-5">
<input id="chkSnmpSettings_PRouter" name="chkSnmpSettings_PRouter"
type="checkbox" checked="" class="ace-input">
</input>
<span class="ace-lbl ">&nbsp;</span>
</div>
</div>
<div class="widget-box transparent" id="snmpSettings_PRouter" class="hide">
<div class="widget-header">
<h4 class="smaller" onclick="collapseElement(this,'#PRoutersnmpCredWidget');">
<i class="icon-caret-right grey"></i>
<i class="icon-caret-down grey"></i>
<span>SNMP Settings</span>
</h4>
</div>
<div id="PRoutersnmpCredWidget" class="widget-body collapsed">
<div id="PRoutersnmpCredWidget" class="widget-body">
<div class="row-fluid widget-main">
<div class="control-group">
<label class="control-label" for='snmpVersion_PRouter'>Version</label>
Expand Down

0 comments on commit fa80cbe

Please sign in to comment.