Merge "Changes for issues with service instances"

Juniper · Feb 5, 2016 · ebb1699 · ebb1699
2 parents 4b56efa + b3f2e8f
commit ebb1699
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/webroot/config/networking/networks/ui/js/models/vnCfgModel.js b/webroot/config/networking/networks/ui/js/models/vnCfgModel.js
@@ -512,6 +512,9 @@ define([
                 if (hostRoutes.length == 0) {
                     delete subnet['host_routes'];
                 }
+                if(dnsServers.length == 0) {
+                    delete subnet['dhcp_option_list'];
+                }
 
                 delete subnet['errors'];
                 delete subnet['locks'];

diff --git a/webroot/config/services/instances/ui/js/models/svcInstModel.js b/webroot/config/services/instances/ui/js/models/svcInstModel.js
@@ -33,7 +33,6 @@ define([
                     max_instances: 1
                 },
             },
-            service_template: null,
             service_template_refs: [],
             fq_name: [],
             uuid: null,
@@ -820,9 +819,16 @@ define([
         getSIProperties: function() {
             var siProp = {};
             var intfList = [];
+            var stVersion;
+            var sTemplate = getValueByJsonPath(this.model().attributes,
+                "service_template", "");
+            stVersion = sTemplate.split('] - ')[1];
             var coll = this.model().attributes.interfaces;
             var len = coll.length;
             var models = coll['models'];
+            if(stVersion.toString().toLowerCase() === "v2") {
+                return siProp;
+            }
             for (var i = 0; i < len; i++) {
                 var attr = models[i]['attributes'];
                 intfList[i] = {};
@@ -867,21 +873,32 @@ define([
             if ((null != list) && (list.length > 0)) {
                 propObjs['interface_route_table_back_refs'] =
                     list;
+            } else {
+                propObjs['interface_route_table_back_refs'] = [];
             }
+
             list =
                 this.getSvcInstPropertiesByType('service_health_check_back_refs');
             if ((null != list) && (list.length > 0)) {
                 propObjs['service_health_check_back_refs'] = list;
+            } else {
+                propObjs['service_health_check_back_refs'] = [];
             }
+
             list =
                 this.getSvcInstPropertiesByType('route_aggregate_back_refs');
             if ((null != list) && (list.length > 0)) {
                 propObjs['route_aggregate_back_refs'] = list;
+            }else {
+                propObjs['route_aggregate_back_refs'] = [];
             }
+
             list =
                 this.getSvcInstPropertiesByType('routing_policy_back_refs');
             if ((null != list) && (list.length > 0)) {
                 propObjs['routing_policy_back_refs'] = list;
+            } else {
+                propObjs['routing_policy_back_refs'] = [];
             }
             return propObjs;
         },

diff --git a/webroot/config/services/instances/ui/js/views/svcInstGridView.js b/webroot/config/services/instances/ui/js/views/svcInstGridView.js
@@ -302,7 +302,7 @@ define([
                                         }
                                     },
                                     {
-                                        key: 'service_instance_properties',
+                                        key: 'service_instance_properties.interface_list',
                                         keyClass: 'span2',
                                         label: 'Networks',
                                         templateGenerator: 'TextGenerator',