Change management and PNF support

Issue-ID: VID-44, VID-48, VID-49, VID-50, VID-51, VID-52
Change-Id: I83e940aad2e4e294a0927b546c4c08ca8e539a65
Signed-off-by: Ofir Sonsino <os0695@att.com>

3 files changed, 110 insertions, 79 deletions

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
index f88ee9c35..534cee505 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
@@ -20,7 +20,9 @@
 
 "use strict";
 
-appDS2.constant("COMPONENT", (function() {
+appDS2
+    .constant("_", window._)
+	.constant("COMPONENT", (function() {
     return {
     A_LA_CARTE : "a la carte",
     CLOUD_REGION_ID : "cloudRegionID",
@@ -95,16 +97,30 @@ appDS2.constant("COMPONENT", (function() {
 	VPN_ID_1 : "1a2b3c4d5e6f",
 	
 	// PATHS
+	GET_WORKFLOW: "change-management/workflow?vnfs=@vnfs",
+	GET_MSO_WORKFLOWS: "change-management/mso",
+	GET_SCHEDULER_CHANGE_MANAGEMENTS: "change-management/scheduler",
 	ASSIGN : "?r=",
 	AAI_GET_SERVICE_INSTANCE_PATH : "aai_get_service_instance/",
 	AAI_GET_SERVICES : "aai_get_services",
     AAI_GET_AIC_ZONES :"aai_get_aic_zones",
+    AAI_GET_AIC_ZONE_FOR_PNF :"aai_get_aic_zone_for_pnf/@globalCustomerId/@serviceType/@serviceInstanceId",
     AAI_GET_SERVICES_BY_TYPE : "aai_get_models_by_service_type",
 	AAI_GET_TENANTS : "aai_get_tenants/",
 	AAI_SUB_DETAILS_PATH : "aai_sub_details/",
+	AAI_GET_VERSION_BY_INVARIANT_ID:"aai_get_version_by_invariant_id/",
+	AAI_GET_VNF_DATA_PATH: "aai_get_vnf_data/",
+	AAI_GET_VNF_BY_CUSTOMERID_AND_SERVICETYPE: "get_vnf_data_by_globalid_and_service_type/",
 	AAI_SUB_VIEWEDIT_PATH : "aai_sub_viewedit",
+	AAI_GET_VNF_INFO : "aai_get_vnf_information",
 	ASDC_GETMODEL_PATH : "asdc/getModel/",
 	CREATE_INSTANCE_PATH : "/models/services/createInstance", 
+	//1710 scheduler contants
+	POST_CREATE_NEW_VNF_CHANGE:"post_create_new_vnf_change",
+	GET_POLICY:"get_policy",
+	GET_TIME_SLOTS:"get_time_slots",
+	SUBMIT_VNF_CHANGE_TIMESLOTS:"submit_vnf_change_timeslots",
+	
 	FORWARD_SLASH : "/",
 	GET_SYSTEM_PROP_VNF_PROV_STATUS_PATH : "get_system_prop_vnf_prov_status",
 	GET_USER_ID : "getuserID",
@@ -116,6 +132,7 @@ appDS2.constant("COMPONENT", (function() {
 	MSO_CREATE_NW_INSTANCE_PATH : "mso_create_nw_instance/",
 	MSO_CREATE_SVC_INSTANCE : "mso_create_svc_instance",
 	MSO_DELETE_SVC_INSTANCE_PATH : "mso_delete_svc_instance/",
+	MSO_ACTIVATE_INSTANCE: "mso/mso_activate_service_instance/@serviceInstanceId",
 	SELECTED_SERVICE_SUB_PATH : "#/instances/subdetails?selectedServiceSubscription=",
 	SELECTED_SUB_PATH : "#/instances/subdetails?selectedSubscriber=",
 	SELECTEDSERVICEINSTANCE_SUB_PATH : "&selectedServiceInstance=",
@@ -154,6 +171,13 @@ appDS2.constant("COMPONENT", (function() {
 	    "vfmodule" : "VF Module",
 	    "vnf" : "VNF",
 	    "volumegroup" : "Volume Group"
+	},
+
+	MANUAL_TASKS: {
+    	"retry": "retry",
+    	"rollback": "rollback",
+    	"abort": "abort",
+    	"skip": "skip"
 	}
 	
     };
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js
index 9d337fa11..9e3f44cc2 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js
@@ -31,7 +31,7 @@ appDS2.factory("FIELD", ["PARAMETER", function (PARAMETER) {
         LCP_REGION: "lcpRegion",

         LCP_REGION_TEXT: "lcpRegionText",

         PRODUCT_FAMILY: "productFamily",

-        AIC_ZONES : "aic_zone",

+        AIC_ZONES: "aic_zone",

         SERVICE_TYPE: "serviceType",

         SERVICE_ROLE: "serviceRole",

         SUBSCRIBER_NAME: "subscriberName",

@@ -127,8 +127,8 @@ appDS2.factory("FIELD", ["PARAMETER", function (PARAMETER) {
         SDN_C_PRELOAD: "sdncPreload",

         UPLOAD_SUPPLEMENTORY_DATA_FILE: "uploadSupplementoryDataFile",

         SUPPLEMENTORY_DATA_FILE: "supplementoryDataFile",

-        ZONE_ID:"zone-id",

-        ZONE_NAME:"zone-name",

+        ZONE_ID: "zone-id",

+        ZONE_NAME: "zone-name",

 

     };

 

@@ -140,57 +140,58 @@ appDS2.factory("FIELD", ["PARAMETER", function (PARAMETER) {
      * NAME values are displayed on GUI pages.

      */

     var NAME = {

-	AVAILABLE_VOLUME_GROUP : "Available Volume Group",

-	INSTANCE_NAME : "Instance Name",

-	CUSTOMER_ID : "Customer ID",

-	LCP_REGION : "LCP Region",

-	LCP_REGION_TEXT : "Legacy Region",

-	MODEL_INVARIANT_UUID: "Model Invariant UUID",

-	MODEL_NAME: "Model Name",

-	MODEL_VERSION: "Model Version",

-	MODEL_UUID: "Model UUID",

-	MODEL_CUSTOMIZATION_UUID: "Model Customization UUID",

-	MODEL_VNF_TYPE: "NF Type",

-	MODEL_VNF_ROLE: "NF Role",

-	MODEL_VNF_FUNCTION: "NF Function",

-	MODEL_VNF_CODE: "NF Naming Code",

-	MODEL_CUSTOMIZATION_NAME: "Resource Name",

-	PRODUCT_FAMILY : "Product Family",

+        AVAILABLE_VOLUME_GROUP: "Available Volume Group",

+        INSTANCE_NAME: "Instance Name",

+        CUSTOMER_ID: "Customer ID",

+        LCP_REGION: "LCP Region",

+        LCP_REGION_TEXT: "Legacy Region",

+        MODEL_INVARIANT_UUID: "Model Invariant UUID",

+        MODEL_NAME: "Model Name",

+        MODEL_VERSION: "Model Version",

+        MODEL_UUID: "Model UUID",

+        MODEL_CUSTOMIZATION_UUID: "Model Customization UUID",

+        MODEL_VNF_TYPE: "NF Type",

+        MODEL_VNF_ROLE: "NF Role",

+        MODEL_VNF_FUNCTION: "NF Function",

+        MODEL_VNF_CODE: "NF Naming Code",

+        MODEL_CUSTOMIZATION_NAME: "Resource Name",

+        PRODUCT_FAMILY: "Product Family",

         AIC_ZONES: "AIC Zone",

-	RESOURCE_DESCRIPTION : "Resource Description",

-	RESOURCE_NAME : "Resource Name",

-	SERVICE_CATEGORY : "Service Category",

-	SERVICE_DESCRIPTION : "Service Description",

-	SERVICE_INSTANCE_ID : "Service Instance ID",

-	SERVICE_INSTANCE_Id : "Service Instance Id",

-	SERVICE_INSTANCE_NAME : "Service Instance Name",

-	SERVICE_INVARIANT_UUID : "Service Invariant UUID",

-	SERVICE_NAME : "Service Name",

-	SERVICE_TYPE : "Service Type",

-	SERVICE_UUID : "Service UUID",

-	SERVICE_VERSION : "Service Version",

-	SUBSCRIBER_NAME : "Subscriber Name",

-	MOBILITY :  "Mobility",

-	SUPPRESS_ROLLBACK : "Suppress Rollback on Failure",

-	SDN_C_PRELOAD : "SDN-C Pre-Load",

-	UPLOAD_SUPPLEMENTORY_DATA_FILE : "Upload Supplementary Data file",

-	SUPPLEMENTORY_DATA_FILE : "Supplementory Data file (JSON format)",

-	TENANT : "Tenant",

-	USER_SERVICE_INSTANCE_NAME : "User Service Instance Name",

-	VF_MODULE_DESCRIPTION : "VF Module Description",

-	VF_MODULE_LABEL : "VF Module Label",

-	VF_MODULE_TYPE : "VF Module Type",

-	VNF_ORCHESTRATION_STATUS : "Orchestration Status",

-	VNF_Operational_Status: "Operational Status",

-	VNF_Current_Prov_Status: "Current Prov_Status",

-	VNF_Target_Prov_Status: "Target Prov Status",

-	VNF_VNF_ID : "VNF ID",

-	VNF_VNF_Name: "VNF Name",

-	VNF_VNF_Type: "VNF Type",

-	VNF_Service_ID: "Service ID",

-	VNF_In_Maint: "In Maint",

-	VFMDULE_CUSTOMIZATIONUUID: "VF Module Model Customization UUID",

-	RESOURCE_CUSTOMIZATION_UUID: "Resource Model Customization UUID"

+        RESOURCE_DESCRIPTION: "Resource Description",

+        RESOURCE_NAME: "Resource Name",

+        SERVICE_CATEGORY: "Service Category",

+        SERVICE_DESCRIPTION: "Service Description",

+        SERVICE_INSTANCE_ID: "Service Instance ID",

+        SERVICE_INSTANCE_Id: "Service Instance Id",

+        SERVICE_INSTANCE_NAME: "Service Instance Name",

+        SERVICE_INVARIANT_UUID: "Service Invariant UUID",

+        SERVICE_NAME: "Service Name",

+        SERVICE_TYPE: "Service Type",

+        SERVICE_ROLE: "Service Role",

+        SERVICE_UUID: "Service UUID",

+        SERVICE_VERSION: "Service Version",

+        SUBSCRIBER_NAME: "Subscriber Name",

+        MOBILITY: "Mobility",

+        SUPPRESS_ROLLBACK: "Suppress Rollback on Failure",

+        SDN_C_PRELOAD: "SDN-C Pre-Load",

+        UPLOAD_SUPPLEMENTORY_DATA_FILE: "Upload Supplementary Data file",

+        SUPPLEMENTORY_DATA_FILE: "Supplementory Data file (JSON format)",

+        TENANT: "Tenant",

+        USER_SERVICE_INSTANCE_NAME: "User Service Instance Name",

+        VF_MODULE_DESCRIPTION: "VF Module Description",

+        VF_MODULE_LABEL: "VF Module Label",

+        VF_MODULE_TYPE: "VF Module Type",

+        VNF_ORCHESTRATION_STATUS: "Orchestration Status",

+        VNF_Operational_Status: "Operational Status",

+        VNF_Current_Prov_Status: "Current Prov_Status",

+        VNF_Target_Prov_Status: "Target Prov Status",

+        VNF_VNF_ID: "VNF ID",

+        VNF_VNF_Name: "VNF Name",

+        VNF_VNF_Type: "VNF Type",

+        VNF_Service_ID: "Service ID",

+        VNF_In_Maint: "In Maint",

+        VFMDULE_CUSTOMIZATIONUUID: "VF Module Model Customization UUID",

+        RESOURCE_CUSTOMIZATION_UUID: "Resource Model Customization UUID"

     };

 

     /*

@@ -267,29 +268,29 @@ appDS2.factory("FIELD", ["PARAMETER", function (PARAMETER) {
     }

 

     var ERROR = {

-    		AAI : "A&AI failure - see log below for details",

-    		AAI_ERROR : "A&AI Error",

-    		AAI_FETCHING_CUST_DATA : "Failed to fetch customer data from A&AI: Response Code: ",

-    		FETCHING_SERVICE_TYPES : "Failed to fetch service types from A&AI: Response Code: ",

-    		FETCHING_SERVICES : "Failed to fetch services from A&AI: Response Code: ",

-    		FETCHING_SERVICE_INSTANCE_DATA : "Failed to fetch service instance data from A&AI: Response Code: ",

-    		INVALID_INSTANCE_NAME : "Invalid instance name: ",

-    		INSTANCE_NAME_VALIDATE : "The instance name must contain only alphanumeric or \"_-.\" characters, and must start with an alphabetic character",	

-    		INVALID_LIST : "Invalid list parameter: ",

-    		INVALID_MAP : "Invalid map parameter: ",

-    		LIST_VALIDATE : "A list parameter value must have the following syntax: '[<value1>,\.\.\.,<valueN>]'",

-    		MAP_VALIDATE : "A map parameter value must have the following syntax: '{ <entry_key_1>: <entry_value_1>, \.\.\., <entry_key_n>: <entry_value_n> }'",

-    		MAX_POLLS_EXCEEDED : "Maximum number of poll attempts exceeded",

-    		MISSING_DATA : "Missing data",

-    		MODEL_VERSION_ID_MISSING : "Error: model-version-id is not populated in A&AI",

-    		MSO : "MSO failure - see log below for details",

-    		NO_MATCHING_MODEL : "No matching model found matching the persona Model Id = ",

-    		NO_MATCHING_MODEL_AAI : "No matching model found matching the A&AI model version ID = ",

-    		SELECT : "Please select a subscriber or enter a service instance", 

-    		SERVICE_INST_DNE : "That service instance does not exist.  Please try again.",

-    		SYSTEM_FAILURE : "System failure",

-    		INVALID_DATA_FORMAT : 'Invalid data format.Please check your file content whether it is not in json or not.',

-    		MISSING_FILE : 'Please Select JSON File.',

+        AAI: "A&AI failure - see log below for details",

+        AAI_ERROR: "A&AI Error",

+        AAI_FETCHING_CUST_DATA: "Failed to fetch customer data from A&AI: Response Code: ",

+        FETCHING_SERVICE_TYPES: "Failed to fetch service types from A&AI: Response Code: ",

+        FETCHING_SERVICES: "Failed to fetch services from A&AI: Response Code: ",

+        FETCHING_SERVICE_INSTANCE_DATA: "Failed to fetch service instance data from A&AI: Response Code: ",

+        INVALID_INSTANCE_NAME: "Invalid instance name: ",

+        INSTANCE_NAME_VALIDATE: "The instance name must contain only alphanumeric or \"_-.\" characters, and must start with an alphabetic character",

+        INVALID_LIST: "Invalid list parameter: ",

+        INVALID_MAP: "Invalid map parameter: ",

+        LIST_VALIDATE: "A list parameter value must have the following syntax: '[<value1>,\.\.\.,<valueN>]'",

+        MAP_VALIDATE: "A map parameter value must have the following syntax: '{ <entry_key_1>: <entry_value_1>, \.\.\., <entry_key_n>: <entry_value_n> }'",

+        MAX_POLLS_EXCEEDED: "Maximum number of poll attempts exceeded",

+        MISSING_DATA: "Missing data",

+        MODEL_VERSION_ID_MISSING: "Error: model-version-id is not populated in A&AI",

+        MSO: "MSO failure - see log below for details",

+        NO_MATCHING_MODEL: "No matching model found matching the persona Model Id = ",

+        NO_MATCHING_MODEL_AAI: "No matching model found matching the A&AI model version ID = ",

+        SELECT: "Please select a subscriber or enter a service instance",

+        SERVICE_INST_DNE: "That service instance does not exist.  Please try again.",

+        SYSTEM_FAILURE: "System failure",

+        INVALID_DATA_FORMAT: 'Invalid data format.Please check your file content whether it is not in json or not.',

+        MISSING_FILE: 'Please Select JSON File.',

 

     }

 

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js
index 4341a4cac..ee33875b9 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js
@@ -84,6 +84,10 @@ appDS2.constant("VIDCONFIGURATION", (function() {
 	 * Number of msecs that VID will wait between MSO polls.

 	 */

 	var MSO_POLLING_INTERVAL_MSECS = 10000;

+	

+	var SCHEDULER_POLLING_INTERVAL_MSECS = 10000;

+	

+	var SCHEDULER_MAX_POLLS = 10;

 	/*

 	 * List of all service model invariant UUIDs that need macro instantiation.

 	 * Example:

@@ -91,14 +95,16 @@ appDS2.constant("VIDCONFIGURATION", (function() {
 	 * 

 	 */

 	var COMPONENT_LIST_NAMED_QUERY_ID = "0367193e-c785-4d5f-9cb8-7bc89dc9ddb7";

-	var MACRO_SERVICES = ["93150ffa-00c6-4ea0-85f2-3536ca46ebd2",

+	var MACRO_SERVICES = ["c9514b73-3dfe-4d7e-9146-b318d48655d9", "93150ffa-00c6-4ea0-85f2-3536ca46ebd2",

 		"2b54297f-72e7-4a94-b451-72df88d0be0b",

 		"d27e42cf-087e-4d31-88ac-6c4b7585f800",

-		"ec0c4bab-c272-4dab-b087-875031bb0c9f","0311f998-9268-4fd6-bbba-afff15087b72"];

+		"ec0c4bab-c272-4dab-b087-875031bb0c9f","0311f998-9268-4fd6-bbba-afff15087b72","43596836-ae36-4608-a987-6608ede10dac","306caa85-74c7-48a9-aa22-7e3a564b957a"];

     return {

     	ASDC_MODEL_STATUS : ASDC_MODEL_STATUS,

     	MSO_MAX_POLLS : MSO_MAX_POLLS,

     	MSO_POLLING_INTERVAL_MSECS : MSO_POLLING_INTERVAL_MSECS,

+    	SCHEDULER_MAX_POLLS : SCHEDULER_MAX_POLLS,

+    	SCHEDULER_POLLING_INTERVAL_MSECS : SCHEDULER_POLLING_INTERVAL_MSECS,

     	VNF_STATUS_CHECK_ENABLED : VNF_STATUS_CHECK_ENABLED,

     	VNF_VALID_STATUS_LIST : vnfValidStatusList,

 		UPLOAD_SUPPLEMENTARY_STATUS_CHECK_ENABLED : UPLOAD_SUPPLEMENTARY_STATUS_CHECK_ENABLED,