Global Read only role, Support VID specific Roles

Issue-ID: VID-46 , VID-47
Change-Id: Ib100d20ac40a65d39e27a6e2741b19a173a2b8ea
Signed-off-by: Ofir Sonsino <os0695@att.com>

3 files changed, 331 insertions, 307 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 e7cbc486..f88ee9c3 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
@@ -50,7 +50,8 @@ appDS2.constant("COMPONENT", (function() {
 	SDN_L3_BONDING : "SDN-L3-BONDING",
 	SDN_ETHERNET_INTERNET : "SDN-ETHERNET-INTERNET",
 	SERVICE : "service",
-	SERVICE_TYPE : "serviceType",
+    OLDVERSION : 'oldversion',
+    SERVICE_TYPE : "serviceType",
 	SHOW_COMPONENT_DETAILS : "showComponentDetails",
 	STATUS : "status",
 	SUBSCRIBER_NAME : "subscriberName",
@@ -65,9 +66,10 @@ appDS2.constant("COMPONENT", (function() {
 	VNF_ROLE : "vnfRole",
 	VNF_TYPE : "vnfType",
 	VOLUME_GROUP : "volumeGroup",
-	
-	
-	// IDs
+    IS_PERMITTED: "is-permitted",
+
+
+        // IDs
 	CIDR_MASK_1 : "255.255.255.000",
 	//COMPONENT_LIST_NAMED_QUERY_ID : "ed0a0f5b-cf79-4784-88b2-911cd726cd3d",
 	CUSTOMER_ID_1 : "icore9883749",
@@ -96,7 +98,8 @@ appDS2.constant("COMPONENT", (function() {
 	ASSIGN : "?r=",
 	AAI_GET_SERVICE_INSTANCE_PATH : "aai_get_service_instance/",
 	AAI_GET_SERVICES : "aai_get_services",
-	AAI_GET_SERVICES_BY_TYPE : "aai_get_models_by_service_type",
+    AAI_GET_AIC_ZONES :"aai_get_aic_zones",
+    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_SUB_VIEWEDIT_PATH : "aai_sub_viewedit",
@@ -128,8 +131,9 @@ appDS2.constant("COMPONENT", (function() {
 	SUBDETAILS_SELECTEDSUBSCRIBER : "#subdetails?selectedSubscriber=",
 	SUBSCRIBERNAME_SUB_PATH : "&subscriberName=",
 	WELCOME_PATH : "welcome.htm",
-	
-	//Template Urls
+    IS_PERMITTED_SUB_PATH: "&isPermitted=",
+
+    //Template Urls
 	AAI_GET_SUBS_URL : "app/vid/scripts/view-models/aaiGetSubs.htm",
 	AAI_GET_SUBSCRIBER_URL : "app/vid/scripts/view-models/aaiGetSubscriberList.htm",
 	AAI_SERVICE_TYPES_URL : "app/vid/scripts/view-models/aaiServiceTypes.htm",
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 03ec788b..9d337fa1 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
@@ -20,116 +20,122 @@
 

 "use strict";

 

-appDS2.factory("FIELD", [ "PARAMETER", function(PARAMETER) {

+appDS2.factory("FIELD", ["PARAMETER", function (PARAMETER) {

 

     /*

      * ID values are typically used internally.

      */

     var ID = {

-		AVAILABLE_VOLUME_GROUP : "availableVolumeGroup",

-		INSTANCE_NAME : "instanceName",

-		LCP_REGION : "lcpRegion",

-		LCP_REGION_TEXT : "lcpRegionText",

-		PRODUCT_FAMILY : "productFamily",

-		SERVICE_TYPE : "serviceType",

-		SUBSCRIBER_NAME : "subscriberName",

-		SUPPRESS_ROLLBACK : "suppressRollback",

-		TENANT : "tenant",

-		VNF_TARGETPROVSTATUS : "target",

-		

-		AAI_GET_FULL_SUBSCRIBERS : "aai_get_full_subscribers",

-		AAI_REFRESH_FULL_SUBSCRIBERS : "aai_refresh_full_subscribers",

-		AAI_GET_SERVICES : "aai_get_services",

-		AAI_GET_SUBSCRIBERS : "aai_get_subscribers",

-		AAI_GET_TENTANTS : "aai_get_tenants",

-		AAI_REFRESH_SUBSCRIBERS : "aai_refresh_subscribers",

-		AAI_SUB_DETAILS : "aai_sub_details",

-		AAI_SUB_VIEWEDIT : "aai_sub_viewedit",

-		ANGULAR_UI_TREE_COLLAPSEALL : "angular-ui-tree:collapse-all",

-		ANGULAR_UI_TREE_EXPANDALL : "angular-ui-tree:expand-all",

-		CATEGORY : "category",

-		COLOR_8F8 : "#8F8",

-		COLOR_F88 : "#F88",

-		COLOR_NONE : "none",

-		CUSTOMER : "customer",

-		CUSTOMIZATION_UUID : "customizationUuid",

-		DESCRIPTION : "description",

-		GENERIC_VNF : "generic-vnf",

-		GLOBAL_CUSTOMER_ID : "global-customer-id",

-		GLOBAL_CUST_ID : "globalCustomerId",

-		IN_MAINT : "in-maint",

-		INVENTORY_RESPONSE_ITEMS : "inventory-response-items",

-		INVENTORY_RESPONSE_ITEM : "inventory-response-item",

-		L3_NETWORK : "l3-network",

-		SUB_NET : "subnet",

-		SUBNET_NAME : "subnet-name",

-		SUBNET_ID : "subnet-id",

-		GATEWAY_ADDRESS : "gateway-address",

-		NETWORK_START_ADDRESS : "network-start-address",

-		CIDR_MASK : "cidr-mask",

-		MODEL_CUSTOMIZATION_ID : "model-customization-id",

-		MODEL_CUSTOMIZATION_NAME : "modelCustomizationName",

-		MODEL_INVARIANT_ID : "modelInvariantId",

-		MODEL_INVAR_ID : "model-invariant-id",

-		MODEL_NAME : "modelName",

-		MODEL_NAME_VERSION_ID : "modelNameVersionId",

-		MODEL_VERSION : "modelVersion",

-		MODEL_VERSION_ID : "model-version-id",

-		NETWORK_NAME : "network-name",

-		NETWORK_ID : "network-id",

-		NETWORK_TYPE : "network-type",

-		NETWORKS : "networks",

-		OPERATIONAL_STATUS : "operational-status",

-		ORCHESTRATION_STATUS : "orchestration-status",

-		PERCENT_PROGRESS : "precentProgress",

-		PERSONA_MODEL_ID : "persona-model-id",

-		PERSONA_MODEL_VERSION : "persona-model-version",

-		PERSONA_MODEL_CUSTOMIZATION_ID : "persona-model-customization-id",

-		PROV_STATUS : "prov-status",

-		REQUEST : "request",

-		REQUEST_ID : "requestId",

-		REQUEST_LIST : "requestList",

-		REQUEST_TYPE : "requestType",

-		REQUEST_REFERENCES : "requestReferences",

-		REQUEST_STATE : "requestState",

-		REQUEST_STATUS : "requestStatus",

-		RESOURCE_LINK : "resource-link",

-		RESULT_DATA : "result-data",

-		SERVICE_DESCRIPTION : "service-description",

-		SERVICE_ID : "service-id",

-		SERVICE_INSTANCE : "service-instance",

-		SERVICE_INSTANCES : "service-instances",

-		SERVICE_INSTANCE_ID : "service-instance-id",

-		SERVICE_INSTANCE_NAME : "service-instance-name",

-		SERVICE_SUBSCRIPTION : "service-subscription",

-		SERVICE_SUBSCRIPTIONS : "service-subscriptions",

-		SERVICETYPE : "service-type",

-		STATUS_MESSAGE : "statusMessage",

-		SUBNAME : "subscriber-name",

-		TIMESTAMP : "timestamp",

-		VF_MODULE : "vf-module",

-		VF_MODULES : "vfModules",

-		VF_MODULE_ID : "vf-module-id",

-		VF_MODULE_NAME : "vf-module-name",

-		VID : "VID",

-		VNF_ID : "vnf-id",

-		VNF_NAME : "vnf-name",

-		VNF_TYPE : "vnf-type",

-		VNFS : "vnfs",

-		AVAILABLEVOLUMEGROUPS : "availableVolumeGroups",

-		VOLUMEGROUPS : "volumeGroups",

-		VOLUME_GROUP : "volume-group",

-		VOLUME_GROUP_ID : "volume-group-id",

-		VOLUME_GROUP_NAME : "volume-group-name",

-		SDN_C_PRELOAD : "sdncPreload",

-		UPLOAD_SUPPLEMENTORY_DATA_FILE : "uploadSupplementoryDataFile",

-		SUPPLEMENTORY_DATA_FILE : "supplementoryDataFile"

+        AVAILABLE_VOLUME_GROUP: "availableVolumeGroup",

+        INSTANCE_NAME: "instanceName",

+        LCP_REGION: "lcpRegion",

+        LCP_REGION_TEXT: "lcpRegionText",

+        PRODUCT_FAMILY: "productFamily",

+        AIC_ZONES : "aic_zone",

+        SERVICE_TYPE: "serviceType",

+        SERVICE_ROLE: "serviceRole",

+        SUBSCRIBER_NAME: "subscriberName",

+        SUPPRESS_ROLLBACK: "suppressRollback",

+        TENANT: "tenant",

+        VNF_TARGETPROVSTATUS: "target",

+

+        AAI_GET_FULL_SUBSCRIBERS: "aai_get_full_subscribers",

+        AAI_REFRESH_FULL_SUBSCRIBERS: "aai_refresh_full_subscribers",

+        AAI_GET_SERVICES: "aai_get_services",

+        AAI_GET_SUBSCRIBERS: "aai_get_subscribers",

+        AAI_GET_TENTANTS: "aai_get_tenants",

+        AAI_REFRESH_SUBSCRIBERS: "aai_refresh_subscribers",

+        AAI_SUB_DETAILS: "aai_sub_details",

+        AAI_SUB_VIEWEDIT: "aai_sub_viewedit",

+        ANGULAR_UI_TREE_COLLAPSEALL: "angular-ui-tree:collapse-all",

+        ANGULAR_UI_TREE_EXPANDALL: "angular-ui-tree:expand-all",

+        CATEGORY: "category",

+        COLOR_8F8: "#8F8",

+        COLOR_F88: "#F88",

+        COLOR_NONE: "none",

+        CUSTOMER: "customer",

+        CUSTOMIZATION_UUID: "customizationUuid",

+        DESCRIPTION: "description",

+        GENERIC_VNF: "generic-vnf",

+        GLOBAL_CUSTOMER_ID: "global-customer-id",

+        GLOBAL_CUST_ID: "globalCustomerId",

+        IN_MAINT: "in-maint",

+        INVENTORY_RESPONSE_ITEMS: "inventory-response-items",

+        INVENTORY_RESPONSE_ITEM: "inventory-response-item",

+        L3_NETWORK: "l3-network",

+        SUB_NET: "subnet",

+        SUBNET_NAME: "subnet-name",

+        SUBNET_ID: "subnet-id",

+        GATEWAY_ADDRESS: "gateway-address",

+        NETWORK_START_ADDRESS: "network-start-address",

+        CIDR_MASK: "cidr-mask",

+        MODEL_CUSTOMIZATION_ID: "model-customization-id",

+        MODEL_CUSTOMIZATION_NAME: "modelCustomizationName",

+        MODEL_INVARIANT_ID: "modelInvariantId",

+        MODEL_INVAR_ID: "model-invariant-id",

+        MODEL_NAME: "modelName",

+        MODEL_NAME_VERSION_ID: "modelNameVersionId",

+        MODEL_VERSION: "modelVersion",

+        MODEL_VERSION_ID: "model-version-id",

+        NETWORK_NAME: "network-name",

+        NETWORK_ID: "network-id",

+        NETWORK_TYPE: "network-type",

+        NETWORKS: "networks",

+        OPERATIONAL_STATUS: "operational-status",

+        ORCHESTRATION_STATUS: "orchestration-status",

+        PERCENT_PROGRESS: "precentProgress",

+        PERSONA_MODEL_ID: "persona-model-id",

+        PERSONA_MODEL_VERSION: "persona-model-version",

+        PERSONA_MODEL_CUSTOMIZATION_ID: "persona-model-customization-id",

+        PROV_STATUS: "prov-status",

+        REQUEST: "request",

+        REQUEST_ID: "requestId",

+        REQUEST_LIST: "requestList",

+        REQUEST_TYPE: "requestType",

+        REQUEST_REFERENCES: "requestReferences",

+        REQUEST_STATE: "requestState",

+        REQUEST_STATUS: "requestStatus",

+        RESOURCE_LINK: "resource-link",

+        RESULT_DATA: "result-data",

+        SERVICE_DESCRIPTION: "service-description",

+        SERVICE_ID: "service-id",

+        SERVICE_INSTANCE: "service-instance",

+        SERVICE_INSTANCES: "service-instances",

+        SERVICE_INSTANCE_ID: "service-instance-id",

+        SERVICE_INSTANCE_NAME: "service-instance-name",

+        SERVICE_SUBSCRIPTION: "service-subscription",

+        SERVICE_SUBSCRIPTIONS: "service-subscriptions",

+        SERVICETYPE: "service-type",

+        STATUS_MESSAGE: "statusMessage",

+        SUBNAME: "subscriber-name",

+        IS_PERMITTED: "is-permitted",

+        TIMESTAMP: "timestamp",

+        VF_MODULE: "vf-module",

+        VF_MODULES: "vfModules",

+        VF_MODULE_ID: "vf-module-id",

+        VF_MODULE_NAME: "vf-module-name",

+        VID: "VID",

+        VNF_ID: "vnf-id",

+        VNF_NAME: "vnf-name",

+        VNF_TYPE: "vnf-type",

+        VNFS: "vnfs",

+        AVAILABLEVOLUMEGROUPS: "availableVolumeGroups",

+        VOLUMEGROUPS: "volumeGroups",

+        VOLUME_GROUP: "volume-group",

+        VOLUME_GROUP_ID: "volume-group-id",

+        VOLUME_GROUP_NAME: "volume-group-name",

+        SDN_C_PRELOAD: "sdncPreload",

+        UPLOAD_SUPPLEMENTORY_DATA_FILE: "uploadSupplementoryDataFile",

+        SUPPLEMENTORY_DATA_FILE: "supplementoryDataFile",

+        ZONE_ID:"zone-id",

+        ZONE_NAME:"zone-name",

+

     };

 

     var KEY = {

-	LCP_REGION_TEXT : "AAIAIC25"

+        LCP_REGION_TEXT: "AAIAIC25"

     };

-   

+

     /*

      * NAME values are displayed on GUI pages.

      */

@@ -150,6 +156,7 @@ appDS2.factory("FIELD", [ "PARAMETER", function(PARAMETER) {
 	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",

@@ -163,9 +170,10 @@ appDS2.factory("FIELD", [ "PARAMETER", function(PARAMETER) {
 	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 Supplementory Data file",

+	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",

@@ -189,74 +197,75 @@ appDS2.factory("FIELD", [ "PARAMETER", function(PARAMETER) {
      * PROMPT values are initial values displayed in select lists.

      */

     var PROMPT = {

-	AVAILABLE_VOLUME_GROUP : "Select Volume Group",

-	DEFAULT_A : "A default",

-	DEFAULT_B : "B default",

-	LCP_REGION : "Select LCP Region",

-	NO_SERVICE_INSTANCE : "No Service Instance Found",

-	NO_SERVICE_SUB : "No Service Subscription Found",

-	PRODUCT_FAMILY : "Select Product Family",

-	REGION : "Please choose a region",

-	SERVICE_TYPE : "Select Service Type",

-	SUBSCRIBER_NAME : "Select Subscriber Name",

-	TARGETPROVSTATUS : "Select Target Prov Status",

-	TENANT : "Select Tenant Name",

-	TEXT_INPUT : "Enter data",

-	SELECT_SERVICE : "Select a service type",

-	SELECT_SUB : "Select a subscriber name",

-	FETCHING_SUBS : " Fetching subscriber list from A&AI",

-	REFRESH_SUB_LIST : "Refreshing subscriber list from A&AI...",

-	VAR_DESCRIPTION_A : "This variable is 'a'",

-	VAR_DESCRIPTION_B : "This variable is 'b'",

-	

+        AVAILABLE_VOLUME_GROUP: "Select Volume Group",

+        DEFAULT_A: "A default",

+        DEFAULT_B: "B default",

+        LCP_REGION: "Select LCP Region",

+        NO_SERVICE_INSTANCE: "No Service Instance Found",

+        NO_SERVICE_SUB: "No Service Subscription Found",

+        PRODUCT_FAMILY: "Select Product Family",

+        AIC_ZONES: "Select AIC Zone",

+        REGION: "Please choose a region",

+        SERVICE_TYPE: "Select Service Type",

+        SUBSCRIBER_NAME: "Select Subscriber Name",

+        TARGETPROVSTATUS: "Select Target Prov Status",

+        TENANT: "Select Tenant Name",

+        TEXT_INPUT: "Enter data",

+        SELECT_SERVICE: "Select a service type",

+        SELECT_SUB: "Select a subscriber name",

+        FETCHING_SUBS: " Fetching subscriber list from A&AI",

+        REFRESH_SUB_LIST: "Refreshing subscriber list from A&AI...",

+        VAR_DESCRIPTION_A: "This variable is 'a'",

+        VAR_DESCRIPTION_B: "This variable is 'b'",

+

     };

-    

+

     var STATUS = {

-    		// Status

-    		ALL : "ALL",

-    		COMPLETE : "Complete",

-    		DONE : "Done",

-    		ERROR : "Error",

-    		FAILED : "Failed",

-    		FAILED_SERVICE_MODELS_ASDC : "Failed to get service models from SDC.",

-    		FETCHING_SERVICE_TYPES : "Fetching service types list from A&AI", 

-    		FETCHING_SERVICE_CATALOG : "Fetching service catalog from AAI.  Please wait.",

-    		FETCHING_SERVICE_CATALOG_ASDC : "Fetching service catalog from SDC.  Please wait.",

-    		FETCHING_SUB_DETAILS : "Fetching subscriber details from A&AI for ",

-    		FETCHING_SERVICE_INST_DATA : "Fetching service instance data from A&AI for service-instance-id=",

-    		FETCHING_SUBSCRIBER_LIST_AAI : "Fetching subscriber list from A&AI...",

-    		IN_PROGRESS : "In Progress",

-    		IS_SUCCESSFUL : " isSuccessful: ",

-    		MSO_FAILURE : "msoFailure",

-    		NONE : "None",

-    		NOT_FOUND : "Not Found",

-    		NO_SERVICE_SUBSCRIPTION_FOUND : "No Service Subscription Found",

-    		SUBMITTING_REQUEST : "Submitting Request",

-    		SUCCESS_VNF_PROV_STATUS : "Successfully set the VNF's Prov_Status to ",

-    		UNLOCKED : "Unlocked",

-    		

+        // Status

+        ALL: "ALL",

+        COMPLETE: "Complete",

+        DONE: "Done",

+        ERROR: "Error",

+        FAILED: "Failed",

+        FAILED_SERVICE_MODELS_ASDC: "Failed to get service models from SDC.",

+        FETCHING_SERVICE_TYPES: "Fetching service types list from A&AI",

+        FETCHING_SERVICE_CATALOG: "Fetching service catalog from AAI.  Please wait.",

+        FETCHING_SERVICE_CATALOG_ASDC: "Fetching service catalog from SDC.  Please wait.",

+        FETCHING_SUB_DETAILS: "Fetching subscriber details from A&AI for ",

+        FETCHING_SERVICE_INST_DATA: "Fetching service instance data from A&AI for service-instance-id=",

+        FETCHING_SUBSCRIBER_LIST_AAI: "Fetching subscriber list from A&AI...",

+        IN_PROGRESS: "In Progress",

+        IS_SUCCESSFUL: " isSuccessful: ",

+        MSO_FAILURE: "msoFailure",

+        NONE: "None",

+        NOT_FOUND: "Not Found",

+        NO_SERVICE_SUBSCRIPTION_FOUND: "No Service Subscription Found",

+        SUBMITTING_REQUEST: "Submitting Request",

+        SUCCESS_VNF_PROV_STATUS: "Successfully set the VNF's Prov_Status to ",

+        UNLOCKED: "Unlocked",

+

     };

-    

+

     var STYLE = {

-    		TABLE : "width: auto; margin: 0 auto; border-collapse: collapse; border: none;",

-    		NAME : "width: 220px; text-align: left; vertical-align: middle; font-weight: bold; padding: 3px 5px; border: none;",

-		    VALUE : "width: 400px; text-align: left; vertical-align: middle; padding: 3px 5px; border: none;",

-		    CHECKBOX_VALUE : "width: 400px; text-align: center; vertical-align: middle; padding: 3px 5px; border: none;",

-		    TEXT_INPUT : "height: 25px; padding: 2px 5px;",

-		    CHECKBOX_INPUT : "height: 18px; width: 18px; padding: 2px 5px;",

-		    SELECT : "height: 25px; padding: 2px; text-align: center;",

-		    REQUIRED_LABEL : "width: 25px; padding: 5px 10px 10px 5px;",

-		    

-		    DISABLED : "disabled",

-		    BTN_INACTIVE : "button--inactive",

-		    BTN_PRIMARY : "button--primary",

-		    BTN_TYPE : "btn-type",

-		    MSO_CTRL_BTN : "div[ng-controller=msoCommitController] button",

-		    PRIMARY : "primary",

-		    PROGRESS_BAR_INFO : "progress-bar progress-bar-info",

-		    PROGRESS_BAR_SUCCESS : "progress-bar progress-bar-success",

+        TABLE: "width: auto; margin: 0 auto; border-collapse: collapse; border: none;",

+        NAME: "width: 220px; text-align: left; vertical-align: middle; font-weight: bold; padding: 3px 5px; border: none;",

+        VALUE: "width: 400px; text-align: left; vertical-align: middle; padding: 3px 5px; border: none;",

+        CHECKBOX_VALUE: "width: 400px; text-align: center; vertical-align: middle; padding: 3px 5px; border: none;",

+        TEXT_INPUT: "height: 25px; padding: 2px 5px;",

+        CHECKBOX_INPUT: "height: 18px; width: 18px; padding: 2px 5px;",

+        SELECT: "height: 25px; padding: 2px; text-align: center;",

+        REQUIRED_LABEL: "width: 25px; padding: 5px 10px 10px 5px;",

+

+        DISABLED: "disabled",

+        BTN_INACTIVE: "button--inactive",

+        BTN_PRIMARY: "button--primary",

+        BTN_TYPE: "btn-type",

+        MSO_CTRL_BTN: "div[ng-controller=msoCommitController] button",

+        PRIMARY: "primary",

+        PROGRESS_BAR_INFO: "progress-bar progress-bar-info",

+        PROGRESS_BAR_SUCCESS: "progress-bar progress-bar-success",

     }

-    

+

     var ERROR = {

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

     		AAI_ERROR : "A&AI Error",

@@ -280,7 +289,8 @@ appDS2.factory("FIELD", [ "PARAMETER", function(PARAMETER) {
     		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.',

+

     }

 

     /*

@@ -289,143 +299,150 @@ appDS2.factory("FIELD", [ "PARAMETER", function(PARAMETER) {
      */

 

     var PARAMETER = {

-	AVAILABLE_VOLUME_GROUP : {

-	    name : NAME.AVAILABLE_VOLUME_GROUP,

-	    id : ID.AVAILABLE_VOLUME_GROUP,

-	    type : PARAMETER.SELECT,

-	    prompt : PROMPT.AVAILABLE_VOLUME_GROUP,

-	    isRequired : true

-	},

-	INSTANCE_NAME : {

-	    name : NAME.INSTANCE_NAME,

-	    id : ID.INSTANCE_NAME,

-	    isRequired : true

-	},

-	LCP_REGION : {

-	    name : NAME.LCP_REGION,

-	    id : ID.LCP_REGION,

-	    type : PARAMETER.SELECT,

-	    prompt : PROMPT.LCP_REGION,

-	    isRequired : true

-	},

-	VNF_TARGET_PROVSTATUS : {

-	    name : NAME.VNF_Target_Prov_Status,

-	    id : ID.VNF_TARGETPROVSTATUS,

-	    type : PARAMETER.SELECT,

-	    prompt : PROMPT.TARGETPROVSTATUS,

-	    isRequired : true

-	},

-	LCP_REGION_TEXT_HIDDEN : {

-	    id : ID.LCP_REGION_TEXT,

-	    isVisible : false

-	},

-	LCP_REGION_TEXT_VISIBLE : {

-	    name : NAME.LCP_REGION_TEXT,

-	    id : ID.LCP_REGION_TEXT,

-	    isRequired : true,

-	    isVisible : true

-	},

-	PRODUCT_FAMILY : {

-	    name : NAME.PRODUCT_FAMILY,

-	    id : ID.PRODUCT_FAMILY,

-	    type : PARAMETER.SELECT,

-	    prompt : PROMPT.PRODUCT_FAMILY,

-	    isRequired : true

-	},

-	SERVICE_TYPE : {

-	    name : NAME.SERVICE_TYPE,

-	    id : ID.SERVICE_TYPE,

-	    type : PARAMETER.SELECT,

-	    prompt : PROMPT.SERVICE_TYPE,

-	    isRequired : true

-	},

-	SERVICE_TYPE_DISABLED : {

-	    name : NAME.SERVICE_TYPE,

-	    id : ID.SERVICE_TYPE,

-	    type : PARAMETER.SELECT,

-	    isEnabled : false,

-	    isRequired : true

-	},

-	SUPPRESS_ROLLBACK : {

-	    name : NAME.SUPPRESS_ROLLBACK,

-	    id : ID.SUPPRESS_ROLLBACK,

-	    type : PARAMETER.BOOLEAN,

-	    value : false

-	},

-	SDN_C_PRELOAD_CHECKED : {

-		name : NAME.SDN_C_PRELOAD,

-	    id : ID.SDN_C_PRELOAD,

-	    type : PARAMETER.CHECKBOX,

-	    value : true,

-	    isVisible:true,

-	    isRequired:false

-	},

-	SDN_C_PRELOAD_UNCHECKED : {

-		name : NAME.SDN_C_PRELOAD,

-	    id : ID.SDN_C_PRELOAD,

-	    type : PARAMETER.CHECKBOX,

-	    value : false,

-	    isVisible:true,

-	    isRequired:false

-	},

-	UPLOAD_SUPPLEMENTORY_DATA_FILE_CHECKED : {

-		name : NAME.UPLOAD_SUPPLEMENTORY_DATA_FILE,

-	    id : ID.UPLOAD_SUPPLEMENTORY_DATA_FILE,

-	    type : PARAMETER.CHECKBOX,

-	    value : true,

-	    isVisible:true,

-	    isRequired:false

-	},

-	UPLOAD_SUPPLEMENTORY_DATA_FILE_UNCHECKED : {

-		name : NAME.UPLOAD_SUPPLEMENTORY_DATA_FILE,

-	    id : ID.UPLOAD_SUPPLEMENTORY_DATA_FILE,

-	    type : PARAMETER.CHECKBOX,

-	    value : false,

-	    isVisible:true,

-	    isRequired:false

-	},

-	SUPPLEMENTORY_DATA_FILE : {

-		name : NAME.SUPPLEMENTORY_DATA_FILE,

-	    id : ID.SUPPLEMENTORY_DATA_FILE,

-	    type : PARAMETER.FILE,

-	    isRequired : false,

-	    isVisible : true,

-	    fileData:''

-	},

+        AVAILABLE_VOLUME_GROUP: {

+            name: NAME.AVAILABLE_VOLUME_GROUP,

+            id: ID.AVAILABLE_VOLUME_GROUP,

+            type: PARAMETER.SELECT,

+            prompt: PROMPT.AVAILABLE_VOLUME_GROUP,

+            isRequired: true

+        },

+        INSTANCE_NAME: {

+            name: NAME.INSTANCE_NAME,

+            id: ID.INSTANCE_NAME,

+            isRequired: true

+        },

+        LCP_REGION: {

+            name: NAME.LCP_REGION,

+            id: ID.LCP_REGION,

+            type: PARAMETER.SELECT,

+            prompt: PROMPT.LCP_REGION,

+            isRequired: true

+        },

+        VNF_TARGET_PROVSTATUS: {

+            name: NAME.VNF_Target_Prov_Status,

+            id: ID.VNF_TARGETPROVSTATUS,

+            type: PARAMETER.SELECT,

+            prompt: PROMPT.TARGETPROVSTATUS,

+            isRequired: true

+        },

+        LCP_REGION_TEXT_HIDDEN: {

+            id: ID.LCP_REGION_TEXT,

+            isVisible: false

+        },

+        LCP_REGION_TEXT_VISIBLE: {

+            name: NAME.LCP_REGION_TEXT,

+            id: ID.LCP_REGION_TEXT,

+            isRequired: true,

+            isVisible: true

+        },

+        PRODUCT_FAMILY: {

+            name: NAME.PRODUCT_FAMILY,

+            id: ID.PRODUCT_FAMILY,

+            type: PARAMETER.SELECT,

+            prompt: PROMPT.PRODUCT_FAMILY,

+            isRequired: true

+        },

+        AIC_ZONES: {

+            name: NAME.AIC_ZONES,

+            id: ID.AIC_ZONES,

+            type: PARAMETER.SELECT,

+            prompt: PROMPT.AIC_ZONES,

+            isRequired: false

+        },

+        SERVICE_TYPE: {

+            name: NAME.SERVICE_TYPE,

+            id: ID.SERVICE_TYPE,

+            type: PARAMETER.SELECT,

+            prompt: PROMPT.SERVICE_TYPE,

+            isRequired: true

+        },

+        SERVICE_TYPE_DISABLED: {

+            name: NAME.SERVICE_TYPE,

+            id: ID.SERVICE_TYPE,

+            type: PARAMETER.SELECT,

+            isEnabled: false,

+            isRequired: true

+        },

+        SUPPRESS_ROLLBACK: {

+            name: NAME.SUPPRESS_ROLLBACK,

+            id: ID.SUPPRESS_ROLLBACK,

+            type: PARAMETER.BOOLEAN,

+            value: false

+        },

+        SDN_C_PRELOAD_CHECKED: {

+            name: NAME.SDN_C_PRELOAD,

+            id: ID.SDN_C_PRELOAD,

+            type: PARAMETER.CHECKBOX,

+            value: true,

+            isVisible: true,

+            isRequired: false

+        },

+        SDN_C_PRELOAD_UNCHECKED: {

+            name: NAME.SDN_C_PRELOAD,

+            id: ID.SDN_C_PRELOAD,

+            type: PARAMETER.CHECKBOX,

+            value: false,

+            isVisible: true,

+            isRequired: false

+        },

+        UPLOAD_SUPPLEMENTORY_DATA_FILE_CHECKED: {

+            name: NAME.UPLOAD_SUPPLEMENTORY_DATA_FILE,

+            id: ID.UPLOAD_SUPPLEMENTORY_DATA_FILE,

+            type: PARAMETER.CHECKBOX,

+            value: true,

+            isVisible: true,

+            isRequired: false

+        },

+        UPLOAD_SUPPLEMENTORY_DATA_FILE_UNCHECKED: {

+            name: NAME.UPLOAD_SUPPLEMENTORY_DATA_FILE,

+            id: ID.UPLOAD_SUPPLEMENTORY_DATA_FILE,

+            type: PARAMETER.CHECKBOX,

+            value: false,

+            isVisible: true,

+            isRequired: false

+        },

+        SUPPLEMENTORY_DATA_FILE: {

+            name: NAME.SUPPLEMENTORY_DATA_FILE,

+            id: ID.SUPPLEMENTORY_DATA_FILE,

+            type: PARAMETER.FILE,

+            isRequired: false,

+            isVisible: true,

+            fileData: ''

+        },

 

-	SUBSCRIBER_NAME : {

-		name : NAME.SUBSCRIBER_NAME,

-		id : ID.SUBSCRIBER_NAME,

-	    type : PARAMETER.SELECT,

-	    prompt : PROMPT.SUBSCRIBER_NAME,

+        SUBSCRIBER_NAME: {

+            name: NAME.SUBSCRIBER_NAME,

+            id: ID.SUBSCRIBER_NAME,

+            type: PARAMETER.SELECT,

+            prompt: PROMPT.SUBSCRIBER_NAME,

 		isRequired : true,

 		isSingleOptionAutoSelected : false

-	},

-	TENANT_DISABLED : {

-	    name : NAME.TENANT,

-	    id : ID.TENANT,

-	    type : PARAMETER.SELECT,

-	    isEnabled : false,

-	    isRequired : true

-	},

-	TENANT_ENABLED : {

-	    name : NAME.TENANT,

-	    id : ID.TENANT,

-	    type : PARAMETER.SELECT,

-	    isEnabled : true,

-	    prompt : PROMPT.TENANT,

-	    isRequired : true

-	}

+        },

+        TENANT_DISABLED: {

+            name: NAME.TENANT,

+            id: ID.TENANT,

+            type: PARAMETER.SELECT,

+            isEnabled: false,

+            isRequired: true

+        },

+        TENANT_ENABLED: {

+            name: NAME.TENANT,

+            id: ID.TENANT,

+            type: PARAMETER.SELECT,

+            isEnabled: true,

+            prompt: PROMPT.TENANT,

+            isRequired: true

+        }

     };

 

     return {

-	ID : ID,

-	KEY : KEY,

-	NAME : NAME,

-	PARAMETER : PARAMETER,

-	PROMPT : PROMPT,

-	STATUS : STATUS,

-	STYLE : STYLE,

-	ERROR : ERROR,

+        ID: ID,

+        KEY: KEY,

+        NAME: NAME,

+        PARAMETER: PARAMETER,

+        PROMPT: PROMPT,

+        STATUS: STATUS,

+        STYLE: STYLE,

+        ERROR: ERROR,

     }

-} ]);

+}]);

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 f5606616..4341a4ca 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
@@ -91,7 +91,10 @@ appDS2.constant("VIDCONFIGURATION", (function() {
 	 * 

 	 */

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

-	var MACRO_SERVICES = [];

+	var MACRO_SERVICES = ["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"];

     return {

     	ASDC_MODEL_STATUS : ASDC_MODEL_STATUS,

     	MSO_MAX_POLLS : MSO_MAX_POLLS,