Sending workflow data from UI to SO

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

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/vnfService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/vnfService.js
index 836279b..0150ae6 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/vnfService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/vnfService.js
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================\r
  * VID\r
  * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -41,21 +41,42 @@ var VnfService = function($http, $log, VIDCONFIGURATION, FIELD, UtilityService)
                if ( ( UtilityService.hasContents ( vnfInstance.object[FIELD.ID.ORCHESTRATION_STATUS] ) ) &&\r
                                ( UtilityService.hasContents ( vnfInstance.object[FIELD.ID.IN_MAINT] ) ) &&\r
                                ( UtilityService.hasContents ( vnfInstance.object[FIELD.ID.PROV_STATUS] ) ) ) {\r
-\r
+                       \r
                        status.provStatus = vnfInstance.object[FIELD.ID.PROV_STATUS].toLowerCase();\r
+                       console.log ("PROVSTATUS: " + vnfInstance.object[FIELD.ID.PROV_STATUS].toLowerCase());\r
+                       \r
                        status.orchestrationStatus = vnfInstance.object[FIELD.ID.ORCHESTRATION_STATUS].toLowerCase();\r
+                       console.log ("ORCHESTRATION STATUS: " + vnfInstance.object[FIELD.ID.ORCHESTRATION_STATUS].toLowerCase());\r
+                       \r
                        status.inMaint = vnfInstance.object[FIELD.ID.IN_MAINT];\r
-\r
+                       console.log ("IN MAINT: " + vnfInstance.object[FIELD.ID.IN_MAINT]);\r
+                       \r
                        if ( UtilityService.hasContents(vnfInstance.object[FIELD.ID.OPERATIONAL_STATUS]) ) {\r
                                status.operationalStatus = vnfInstance.object[FIELD.ID.OPERATIONAL_STATUS].toLowerCase();\r
                        }\r
-\r
-                       if ( UtilityService.arrayContains ( VIDCONFIGURATION.VNF_VALID_STATUS_LIST, status ) ) {\r
-                               return ("");\r
-                       }\r
-                       else {\r
-                               return (errorInvalidCombinationMsg);\r
-                       }\r
+                       var i = VIDCONFIGURATION.VNF_VALID_STATUS_LIST.length;\r
+                   if ( i > 0 ) {\r
+                           while (i--) {\r
+                               var item = VIDCONFIGURATION.VNF_VALID_STATUS_LIST[i];\r
+                               if ( (item.provStatus === status.provStatus) && (item.inMaint === status.inMaint ) \r
+                                               && (item.orchestrationStatus === status.orchestrationStatus) )  {\r
+                                       if (UtilityService.hasContents(vnfInstance.object[FIELD.ID.OPERATIONAL_STATUS])) {\r
+                                               if (status.operationalStatus === "") { status.operationalStatus = null }\r
+                                               if ( item.operationalStatus === status.operationalStatus ) {\r
+                                                       return ("");\r
+                                               }\r
+                                       }\r
+                                       else {\r
+                                               // no contents\r
+                                               if ( item.operationalStatus === null ) {\r
+                                                       return ("");\r
+                                               }\r
+                                       }\r
+                              }\r
+                           }\r
+                   }\r
+                       \r
+                       return (errorInvalidCombinationMsg);\r
                }\r
                else {\r
                        return (errorAaiStatusMsg);\r