Closes-bug: #1456576 - [UI] When a VN has more than 1 subnet, IPs are…

… allocated to BMSs only from first subnet Change-Id: Id138921c298bf512c6ddcbf8e490f7173dbbb58f
Juniper · May 22, 2015 · 79886d2 · 79886d2
1 parent 086afd2
commit 79886d2
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js
@@ -351,16 +351,29 @@ function physicalInterfacesConfig() {
             }
         });
 
+        function findSubnetUUIDFromIP(fixedIp, currentVNSubnetDetail){
+            var subnetUUID = '';
+            for(var i=0; i < currentVNSubnetDetail.length; i++) {
+                var eachSubnet = currentVNSubnetDetail[i].subnet;
+                var cidr = eachSubnet.ip_prefix + '/' + eachSubnet.ip_prefix_len;
+                if (isIPBoundToRange(cidr, fixedIp)) {
+                    subnetUUID = currentVNSubnetDetail[i].subnet_uuid;
+                    break;
+                }
+            }
+            return subnetUUID;
+        }
+
         function createPort(portDetails) {
             var postObjInput = {};
             var selVN = $('#ddVN').data('contrailDropdown').getSelectedData()[0];
             selVN = JSON.parse(selVN.data);
-            postObjInput.subnetId = selVN.subnetId;
+            postObjInput.ip = portDetails.ip;
+            postObjInput.subnetId = findSubnetUUIDFromIP(postObjInput.ip, selVN.subnetId);
             postObjInput.fqName = selVN.fqName;
             if(portDetails.mac != '') {
                 postObjInput.mac = portDetails.mac;
             }
-            postObjInput.ip = portDetails.ip;
             $.ajax({
                 url : '/api/tenants/config/ports',
                 type : "POST",
@@ -377,12 +390,12 @@ function physicalInterfacesConfig() {
                 var postObjInput = {};
                 var selVN = $('#ddVN').data('contrailDropdown').getSelectedData()[0];
                 selVN = JSON.parse(selVN.data);
-                postObjInput.subnetId = selVN.subnetId;
+                postObjInput.ip = portsDetails[i].ip;
+                postObjInput.subnetId = findSubnetUUIDFromIP(postObjInput.ip, selVN.subnetId);
                 postObjInput.fqName = selVN.fqName;
                 if(portsDetails[i].mac != '') {
                     postObjInput.mac = portsDetails[i].mac;
                 }
-                postObjInput.ip = portsDetails[i].ip;
                 portCreateAjaxs.push($.ajax({
                     url : '/api/tenants/config/ports',
                     type : "POST",
@@ -1150,7 +1163,7 @@ function physicalInterfacesConfig() {
                  if(field in vn && vn[field].length > 0) {
                     if(vn[field][0].attr != null && vn[field][0].attr.ipam_subnets != null
                         && vn[field][0].attr.ipam_subnets.length > 0) {
-                        subnetUUID = vn[field][0].attr.ipam_subnets[0].subnet_uuid;
+                        subnetUUID = vn[field][0].attr.ipam_subnets;
                     }
                     for(var k = 0; k < vn[field].length; k++) {
                         var ipam = vn[field][k];