Merge from ecomp 3374149f - AngularJS UI

Issue-ID: VID-378

Change-Id: I6b3243b492009035c911f63b93258ea76938fcb9
Signed-off-by: Ittay Stern <ittay.stern@att.com>

3 files changed, 10 insertions, 8 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 5c5801805..3d6ed67ae 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
@@ -77,7 +77,7 @@ appDS2
     TENANT_ID: "tenantID",
     TENANT_NAME: "tenantName",
     TRUE: "true",
-    UCPE_VMS: "uCPE-VMS",
+    UCPE_VMS: "JOSEFINA",
     VF_MODULE: "vfModule",
     VNF: "vnf",
     VNF_CODE: "vnfCode",
@@ -92,7 +92,7 @@ appDS2
     //COMPONENT_LIST_NAMED_QUERY_ID : "ed0a0f5b-cf79-4784-88b2-911cd726cd3d",
     CUSTOMER_ID_1: "icore9883749",
     DELETE_INSTANCE_ID_1: "ff305d54-75b4-ff1b-fff1-eb6b9e5460ff",
-    GATEWAY_ADDRESS_1: "10.10.125.1",
+    GATEWAY_ADDRESS_1: "10.0.0.10",
     GLOBAL_SUBSCRIBER_ID_1: "C12345",
     INSTANCE_ID_1: "ff305d54-75b4-431b-adb2-eb6b9e5ff000",
     INSTANCE_ID_2: "ff305d54-75b4-ff1b-adb2-eb6b9e5460ff",
@@ -129,6 +129,7 @@ appDS2
     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_OMIT_SERVICE_INSTANCES : "&omitServiceInstances=",
     AAI_GET_VERSION_BY_INVARIANT_ID: "aai_get_version_by_invariant_id/",
     AAI_GET_PORT_MIRRORING_CONFIGS_DATA: "aai_getPortMirroringConfigsData",
     AAI_GET_PORT_MIRRORING_SOURCE_PORTS: "aai_getPortMirroringSourcePorts",
@@ -248,18 +249,19 @@ appDS2
       FLAG_ASYNC_INSTANTIATION: "FLAG_ASYNC_INSTANTIATION",
       FLAG_NETWORK_TO_ASYNC_INSTANTIATION: "FLAG_NETWORK_TO_ASYNC_INSTANTIATION",
       FLAG_ADD_MSO_TESTAPI_FIELD: "FLAG_ADD_MSO_TESTAPI_FIELD",
-      FLAG_COLLECTION_RESOURCE_SUPPORT: "FLAG_COLLECTION_RESOURCE_SUPPORT",
       FLAG_SHOW_ASSIGNMENTS: "FLAG_SHOW_ASSIGNMENTS",
       FLAG_SHOW_VERIFY_SERVICE: "FLAG_SHOW_VERIFY_SERVICE",
       FLAG_PNP_INSTANTIATION: "FLAG_PNP_INSTANTIATION",
-      FLAG_DUPLICATE_VNF: "FLAG_DUPLICATE_VNF",
       FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS: "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS",
       FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS: "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS",
       FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST: "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST",
       FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY: "FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY",
       FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE: "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE",
       FLAG_HANDLE_SO_WORKFLOWS: "FLAG_HANDLE_SO_WORKFLOWS",
-      FLAG_CREATE_ERROR_REPORTS: "FLAG_CREATE_ERROR_REPORTS"
+      FLAG_CREATE_ERROR_REPORTS: "FLAG_CREATE_ERROR_REPORTS",
+      FLAG_VF_MODULE_RESUME_STATUS_CREATE: "FLAG_VF_MODULE_RESUME_STATUS_CREATE",
+      FLAG_1908_RELEASE_TENANT_ISOLATION: "FLAG_1908_RELEASE_TENANT_ISOLATION",
+      FLAG_FLASH_REPLACE_VF_MODULE: "FLAG_FLASH_REPLACE_VF_MODULE",
     }
 
   };
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 6b77cb0b6..a46013010 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
@@ -187,7 +187,7 @@ appDS2.factory("FIELD", ["PARAMETER", function (PARAMETER) {
 	SERVICE_UUID : "Service UUID",

 	SERVICE_VERSION : "Service Version",

 	SUBSCRIBER_NAME : "Subscriber Name",

-	MOBILITY :  "Mobility",

+	EMANUEL :  "Emanuel",

 	SUPPRESS_ROLLBACK : "Suppress Rollback on Failure",

 	SDN_C_PRELOAD : "SDN-C Pre-Load",

 	UPLOAD_SUPPLEMENTORY_DATA_FILE : "Upload Supplementary Data file",

@@ -488,7 +488,7 @@ appDS2.factory("FIELD", ["PARAMETER", function (PARAMETER) {
         LINE_OF_BUSINESS: {

             name: NAME.LINE_OF_BUSINESS,

             id: ID.LINE_OF_BUSINESS,

-            type: PARAMETER.MULTI_SELECT,

+            type: PARAMETER.SELECT,

             isEnabled: true,

             prompt: PROMPT.LINE_OF_BUSINESS,

             isRequired: false

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 a93c01f7c..7c2385035 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
@@ -125,6 +125,6 @@ appDS2.constant("VIDCONFIGURATION", (function() {
     	COMPONENT_LIST_NAMED_QUERY_ID : COMPONENT_LIST_NAMED_QUERY_ID,

         SCHEDULER_CALLBACK_URL: SCHEDULER_CALLBACK_URL,

         SCHEDULER_PORTAL_URL: SCHEDULER_PORTAL_URL,

-	        SDNC_SHOW_ASSIGNMENTS_URL: SDNC_SHOW_ASSIGNMENTS_URL

+	    SDNC_SHOW_ASSIGNMENTS_URL: SDNC_SHOW_ASSIGNMENTS_URL

     };

 })())