[VID-12] Delivery of remaining features for v1.1

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / services / utilityService.js

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/utilityService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/utilityService.js
index 1333269..4e4d123 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/utilityService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/utilityService.js
@@ -63,7 +63,7 @@
  * string for some known conditions.\r
  */\r
 \r
-var UtilityService = function($log, DataService) {\r
+var UtilityService = function($log, DataService, PARAMETER) {\r
 \r
     var _this = this;\r
     var convertModel = function (serviceModel) {\r
@@ -153,6 +153,7 @@ var UtilityService = function($log, DataService) {
                                                                if (serviceModel.service != null && serviceModel.service.inputs != null &&\r
                                                                                serviceModel.service.inputs[cmdObj.inputName] != null ) {\r
                                                                        networkModelDisplayInputs[cmdObj.inputName] = (serviceModel.service.inputs[cmdObj.inputName]);\r
+                                                                       networkModelDisplayInputs[cmdObj.inputName][PARAMETER.DISPLAY_NAME] = cmdObj.displayName;\r
                                                                }\r
                                                }\r
                                                                \r
@@ -219,6 +220,7 @@ var UtilityService = function($log, DataService) {
                                                                if (serviceModel.service != null && serviceModel.service.inputs != null &&\r
                                                                                serviceModel.service.inputs[cmdObj.inputName] != null ) {\r
                                                                        vnfModelDisplayInputs[cmdObj.inputName] = (serviceModel.service.inputs[cmdObj.inputName]);\r
+                                                                       vnfModelDisplayInputs[cmdObj.inputName][PARAMETER.DISPLAY_NAME] = cmdObj.displayName;\r
                                                                }\r
                                                }\r
                                                                \r
@@ -243,8 +245,8 @@ var UtilityService = function($log, DataService) {
                                        if (hasContents (vnfModel.properties.nf_function) ) {\r
                                                vnf_function = vnfModel.properties.nf_function;\r
                                        }\r
-                                       if (hasContents (vnfModel.properties.nf_code) ) {\r
-                                               vnf_code = vnfModel.properties.nf_code;\r
+                                       if (hasContents (vnfModel.properties.nf_naming_code) ) {\r
+                                               vnf_code = vnfModel.properties.nf_naming_code;\r
                                        }\r
                                }\r
                                convertedAsdcModel.vnfs[vnfCustomizationUuid]["nfType"] = vnf_type;\r
@@ -344,6 +346,7 @@ var UtilityService = function($log, DataService) {
                                                                if (serviceModel.service != null && serviceModel.service.inputs != null &&\r
                                                                                serviceModel.service.inputs[cmdObj.inputName] != null ) {\r
                                                                        networkModelDisplayInputs[cmdObj.inputName] = (serviceModel.service.inputs[cmdObj.inputName]);\r
+                                                                       networkModelDisplayInputs[cmdObj.inputName][PARAMETER.DISPLAY_NAME] = cmdObj.displayName;\r
                                                                }\r
                                                }\r
                                                                \r
@@ -404,6 +407,7 @@ var UtilityService = function($log, DataService) {
                                                                if (serviceModel.service != null && serviceModel.service.inputs != null &&\r
                                                                                serviceModel.service.inputs[cmdObj.inputName] != null ) {\r
                                                                        vnfModelDisplayInputs[cmdObj.inputName] = (serviceModel.service.inputs[cmdObj.inputName]);\r
+                                                                       vnfModelDisplayInputs[cmdObj.inputName][PARAMETER.DISPLAY_NAME] = cmdObj.displayName;\r
                                                                }\r
                                                }\r
                                                                \r
@@ -637,4 +641,4 @@ var UtilityService = function($log, DataService) {
 }\r
 \r
 //app.factory("UtilityService", UtilityService);\r
-appDS2.factory("UtilityService", [ "$log", "DataService", UtilityService ]);\r
+appDS2.factory("UtilityService", [ "$log", "DataService", "PARAMETER", UtilityService ]);\r