Do not show retain VGs checkbox in VFM Upgrade modal + tests modifications

Business&test(cypress&UT), refactor of some files, fix of typos,
upgrade jest version etc.

Issue-ID: VID-603
Change-Id: I2153c8a7f300bfa34f6817704b08f0c2a046a4e7
Signed-off-by: Amir Skalka <amir.skalka@intl.att.com>

29 files changed, 432 insertions, 491 deletions

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js
index d3075764e..cfab522c7 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js
@@ -347,13 +347,9 @@ var AaiService = function ($http, $log, PropertyService, UtilityService, COMPONE
         getJoinedQueryString: getJoinedQueryString,
 
         getServices2: function (successCallback, errorCallback) {
-
             $http.get(FIELD.ID.AAI_GET_SERVICES, {}, {
-
-
                 timeout: PropertyService.getServerResponseTimeoutMsec()
             }).then(function (response) {
-                var customerList = [];
                 if (response.data != null) {
                     var serviceIdList = [];
                     angular.forEach(response.data, function (value, key) {
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js
index 95bdb3a14..56729f2d3 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js
@@ -1,411 +1,326 @@
-/*-

- * ============LICENSE_START=======================================================

- * VID

- * ================================================================================

- * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END=========================================================

- */

-

-"use strict";

-

-var DataService = function($log, DataService) {

-

-	var _this = this;

-

-	return {

-		getAvailableVolumeGroupList : function() {

-			return _this.availableVolumeGroupList;

-		},

-		setAvailableVolumeGroupList : function(availableVolumeGroupList) {

-			_this.availableVolumeGroupList = availableVolumeGroupList;

-		},

-		getCloudRegionTenantList : function() {

-			return _this.cloudRegionTenantList;

-		},

-		setCloudRegionTenantList : function(cloudRegionTenantList) {

-			_this.cloudRegionTenantList = cloudRegionTenantList;

-		},

-		getCloudOwnerAndLcpCloudRegionFromOptionId : function (cloudRegionOptionId) {

-			var cloudRegionTenantList = this.getCloudRegionTenantList();

-			var cloudRegionTenant = _.find(cloudRegionTenantList, {"cloudRegionOptionId": cloudRegionOptionId});

-			return {

-				cloudOwner: cloudRegionTenant.cloudOwner,

-				cloudRegionId: cloudRegionTenant.cloudRegionId

-			};

-		},

-		getGlobalCustomerId : function() {

-			return _this.globalCustomerId;

-		},

-		setGlobalCustomerId : function(globalCustomerId) {

-			_this.globalCustomerId = globalCustomerId;

-		},

-		getCustomizationUuid : function() {

-			return _this.customizationUUID;

-		},

-		setCustomizationUuid : function(customizationUUID) {

-			_this.customizationUUID = customizationUUID;

-		},

-		getResCustomizationUuid : function() {

-			return _this.rescustomizationUUID;

-		},

-		setResCustomizationUuid : function(rescustomizationUUID) {

-			_this.rescustomizationUUID = rescustomizationUUID;

-		},

-		getInventoryItem : function() {

-			return _this.inventoryItem;

-		},

-		setInventoryItem : function(inventoryItem) {

-			_this.inventoryItem = inventoryItem;

-		},

-		getModelId : function() {

-			return _this.modelId;

-		},

-		setModelId : function(modelId) {

-			_this.modelId = modelId;

-		},

-		getModelInstanceName : function() {

-			return _this.modelInstanceName;

-		},

-		setModelInstanceName : function(modelInstanceName) {

-			_this.modelInstanceName = modelInstanceName;

-		},

-		getModelInfo : function(componentId) {

-			return _this.modelInfo[componentId];

-		},

-		setModelInfo : function(componentId, modelInfo) {

-			if (_this.modelInfo === undefined) {

-				_this.modelInfo = new Object;

-			}

-			_this.modelInfo[componentId] = modelInfo;

-		},

-		getNetworkInstanceId : function() {

-			return _this.networkInstanceId;

-		},

-		setNetworkInstanceId : function(networkInstanceId) {

-			_this.networkInstanceId = networkInstanceId;

-		},

-		getServiceIdList : function() {

-			return _this.serviceIdList;

-		},

-		setServiceIdList : function(serviceIdList) {

-			_this.serviceIdList = serviceIdList;

-		},

-		setAicZones : function(aicZones) {

-			_this.aicZones = aicZones;

-		},

-		getAicZones : function(){

-			return _this.aicZones;

-		},

-        setAicZoneForPNF: function(aicZone) {

-            _this.aicZone = aicZone;

-        },

-        getAicZoneForPNF : function(){

-            return _this.aicZone;

-        },

-		getServiceInstanceId : function() {

-			return _this.serviceInstanceId;

-		},

-		setServiceInstanceId : function(serviceInstanceId) {

-			_this.serviceInstanceId = serviceInstanceId;

-		},

-		getServiceInstanceName : function() {

-			return _this.serviceInstanceName;

-		},

-		setServiceInstanceName : function(serviceInstanceName) {

-			_this.serviceInstanceName = serviceInstanceName;

-		},

-		getServiceName : function() {

-			return _this.serviceName;

-		},

-		setServiceName : function(serviceName) {

-			_this.serviceName = serviceName;

-		},

-		getServiceType : function() {

-			return _this.serviceType;

-		},

-		setServiceType : function(serviceType) {

-			_this.serviceType = serviceType;

-		},

-		getServiceUuid : function() {

-			return _this.serviceUuid;

-		},

-		setServiceUuid : function(serviceUuid) {

-			_this.serviceUuid = serviceUuid;

-		},

-		getServiceTypeName : function() {

-			return _this.serviceTypeName;

-		},

-		setServiceTypeName : function(serviceTypeName) {

-			_this.serviceTypeName = serviceTypeName;

-		},

-		getCreateSubscriberName : function() {

-			return _this.createSubscriberName;

-		},

-		setCreateSubscriberName : function(createSubscriberName) {

-			_this.createSubscriberName = createSubscriberName;

-		},

-		getSdncPreload : function() {

-			return _this.sdncPreload;

-		},

-		setSdncPreload : function(sdncPreload) {

-			_this.sdncPreload = sdncPreload;

-		},

-		getUploadSupplementoryDataFile : function() {

-			return _this.uploadSupplementoryDataFile;

-		},

-		setUploadSupplementoryDataFile : function(uploadSupplementoryDataFile) {

-			_this.uploadSupplementoryDataFile = uploadSupplementoryDataFile;

-		},

-		getSupplementoryDataFile : function() {

-			return _this.supplementoryDataFile;

-		},

-		setSupplementoryDataFile : function(supplementoryDataFile) {

-			_this.supplementoryDataFile = supplementoryDataFile;

-		},

-		getSubscriberId : function() {

-			return _this.subscriberId;

-		},

-		setSubscriberId : function(subscriberId) {

-			_this.subscriberId = subscriberId;

-		},

-		getLoggedInUserId : function() {

-			return _this.loggedInUserId;

-		},

-		setLoggedInUserId : function(loggedInUserId) {

-			_this.loggedInUserId = loggedInUserId;

-		},

-		getSubscriberName : function() {

-			return _this.subscriberName;

-		},

-		setSubscriberName : function(subscriberName) {

-			_this.subscriberName = subscriberName;

-		},

-		getSubscribers : function() {

-			return _this.subscribers;

-		},

-		setSubscribers : function(subscribers) {

-			_this.subscribers = subscribers;

-		},

-		getSubscriptionServiceTypeList : function() {

-			return _this.subscriptionServiceTypeList;

-		},

-		setSubscriptionServiceTypeList : function(subscriptionServiceTypeList) {

-			_this.subscriptionServiceTypeList = subscriptionServiceTypeList;

-		},

-		getUserParams : function() {

-			return _this.userParams;

-		},

-		setUserParams : function(userParams) {

-			_this.userParams = userParams;

-		},

-		getUserServiceInstanceName : function() {

-			return _this.userServiceInstanceName;

-		},

-		setUserServiceInstanceName : function(userServiceInstanceName) {

-			_this.userServiceInstanceName = userServiceInstanceName;

-		},

-		getVfModuleInstanceId : function() {

-			return _this.vfModuleInstanceId;

-		},

-		setVfModuleInstanceId : function(vfModuleInstanceId) {

-			_this.vfModuleInstanceId = vfModuleInstanceId;

-		},

-		getVnfInstanceId : function() {

-			return _this.vnfInstanceId;

-		},

-		setVnfInstanceId : function(vnfInstanceId) {

-			_this.vnfInstanceId = vnfInstanceId;

-		},

-        getVfModuleInstanceName : function() {

-            return _this.vfModuleInstanceName;

-        },

-        setVfModuleInstanceName : function(vfModuleInstanceName) {

-            _this.vfModuleInstanceName = vfModuleInstanceName;

-        },

-		getVolumeGroupInstanceId : function() {

-			return _this.volumeGroupInstanceId;

-		},

-		setVolumeGroupInstanceId : function(volumeGroupInstanceId) {

-			_this.volumeGroupInstanceId = volumeGroupInstanceId;

-		},

-		getLcpRegion : function() {

-			return _this.lcpRegion;

-		},

-		setLcpRegion : function(lcpRegion) {

-			_this.lcpRegion = lcpRegion;

-		},

-		getTenant : function() {

-			return _this.tenant;

-		},

-		setTenant : function(tenant) {

-			_this.tenant = tenant;

-		},

-		getTreeHandle : function() {

-			return _this.treeHandle;

-		},

-		setTreeHandle : function(treeHandle) {

-			_this.treeHandle = treeHandle;

-		},

-		setServiceInstanceToCustomer : function(serviceInstanceToCustomer) {

-			_this.serviceInstanceToCustomer = [];

-			_this.serviceInstanceToCustomer = serviceInstanceToCustomer;

-		},

-		getServiceInstanceToCustomer : function() {

-			return _this.serviceInstanceToCustomer;

-		},

-        getMsoRequestParametersTestApi: function(){

-            return sessionStorage.getItem("msoRequestParametersTestApiValue");

-		},

-		setALaCarte : function(aval) {

-			_this.aLaCarte = aval;

-		},

-		getALaCarte : function() {

-			// if not set return true

-			if (_this.aLaCarte === undefined) {

-				return true;

-			}

-			return _this.aLaCarte;

-		},

-        setShouldIncludeInAsyncInstantiationFlow: function (val) {

-            _this.shouldIncludeInAsyncInstantiationFlow = val;

-        },

-        getShouldIncludeInAsyncInstantiationFlow: function(){

-            if (_this.shouldIncludeInAsyncInstantiationFlow === undefined) {

-                return false;

-            }

-            return _this.shouldIncludeInAsyncInstantiationFlow;

-        },

-		setMacro : function(aval) {

-			_this.macro = aval;

-		},

-		getMacro : function() {

-			if (_this.macro === undefined) {

-				return false;

-			}

-			return _this.macro;

-		},

-		getResources : function() {

-			return _this.resources;

-		},

-		setResources : function(r) {

-			_this.resources = r;

-		},

-		getSystemPropProvStatus : function() {

-			return _this.syspropProvStatusList;

-		},

-		setSystemPropProvStatus : function(r) {

-			_this.syspropProvStatusList = r;

-		},

-		getUpdatedVNFProvStatus : function() {

-			return _this.updatedvnfProvStatus;

-		},

-		setUpdatedVNFProvStatus : function(r) {

-			_this.updatedvnfProvStatus = r;

-		},

-		setArbitraryParameters : function (pList) {

-			_this.arbitraryParameters = pList;

-		},

-		getArbitraryParameters : function () {

-			return _this.arbitraryParameters;

-		},

-		setE2EService:function(b){

-			_this.e2eService=b;

-		},

-		getE2EService:function(){

-			return _this.e2eService;

-		},

-		setHideServiceFields:function(b){

-			_this.hideServiceFields=b;

-		},

-		getHideServiceFields:function(){

-			return _this.hideServiceFields;

-		},

-		getServiceProxies:function(){

-            return _this.serviceProxies;

-        },

-        setServiceProxies:function(serviceProxies){

-             _this.serviceProxies = serviceProxies;

-        },

-        getSourceServiceProxies:function(){

-            return _this.sourceServiceProxies;

-        },

-        setSourceServiceProxies:function(sourceServiceProxies){

-            _this.sourceServiceProxies = sourceServiceProxies;

-        },

-        getCollectorServiceProxies:function(){

-            return _this.collectorServiceProxies;

-        },

-        setCollectorServiceProxies:function(collectorServiceProxies){

-            _this.collectorServiceProxies = collectorServiceProxies;

-        },

-		getConfigurationByPolicy:function() {

-        	return _this.configurationByPolicy;

-		},

-        setConfigurationByPolicy:function (configurationByPolicy) {

-			_this.configurationByPolicy = configurationByPolicy;

-        },

-        getSuppressRollback:function(){

-            return _this.suppressRollback;

-        },

-        setSuppressRollback:function(suppressRollback){

-            _this.suppressRollback = suppressRollback;

-        },

-        getPortMirroningConfigFields:function(){

-            return _this.portMirroningConfigFields;

-        },

-        setPortMirroningConfigFields:function(portMirroningConfigFields){

-            _this.portMirroningConfigFields = portMirroningConfigFields;

-        },

-        getConfigurationInstanceId : function() {

-            return _this.configurationInstanceId;

-        },

-        setConfigurationInstanceId : function(configurationInstanceId) {

-            _this.configurationInstanceId = configurationInstanceId;

-        },

-		getConfigurationStatus: function () {

-			return _this.configurationStatus;

-        },

-        setConfigurationStatus: function (configurationStatus) {

-			_this.configurationStatus = configurationStatus;

-        },

-        getPortStatus: function () {

-            return _this.portStatus;

-        },

-        setPortStatus: function (portStatus) {

-            _this.portStatus = portStatus;

-        },

-        getPortId: function () {

-            return _this.portId;

-        },

-        setPortId: function (portId) {

-            _this.portId = portId;

-        },

-        getPnf: function () {

-            return _this.pnf;

-        },

-        setPnf: function (pnf) {

-            _this.pnf = pnf;

-        },

-        getOwningEntityProperties: function () {

-            return _this.owningEntityProperties;

-        },

-        setOwningEntityProperties: function (properties) {

-            _this.owningEntityProperties = properties;

-        }

-

-	};

-};

-

-appDS2.factory("DataService", [ "$log", DataService ]);

+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+"use strict";
+
+var DataService = function($log, DataService) {
+
+	var _this = this;
+
+	return {
+		getAvailableVolumeGroupList : function() {
+			return _this.availableVolumeGroupList;
+		},
+		setAvailableVolumeGroupList : function(availableVolumeGroupList) {
+			_this.availableVolumeGroupList = availableVolumeGroupList;
+		},
+		getCloudRegionTenantList : function() {
+			return _this.cloudRegionTenantList;
+		},
+		setCloudRegionTenantList : function(cloudRegionTenantList) {
+			_this.cloudRegionTenantList = cloudRegionTenantList;
+		},
+		getCloudOwnerAndLcpCloudRegionFromOptionId : function (cloudRegionOptionId) {
+			var cloudRegionTenantList = this.getCloudRegionTenantList();
+			var cloudRegionTenant = _.find(cloudRegionTenantList, {"cloudRegionOptionId": cloudRegionOptionId});
+			return {
+				cloudOwner: cloudRegionTenant.cloudOwner,
+				cloudRegionId: cloudRegionTenant.cloudRegionId
+			};
+		},
+		getGlobalCustomerId : function() {
+			return _this.globalCustomerId;
+		},
+		setGlobalCustomerId : function(globalCustomerId) {
+			_this.globalCustomerId = globalCustomerId;
+		},
+		getCustomizationUuid : function() {
+			return _this.customizationUUID;
+		},
+		setCustomizationUuid : function(customizationUUID) {
+			_this.customizationUUID = customizationUUID;
+		},
+		getResCustomizationUuid : function() {
+			return _this.rescustomizationUUID;
+		},
+		setResCustomizationUuid : function(rescustomizationUUID) {
+			_this.rescustomizationUUID = rescustomizationUUID;
+		},
+		getInventoryItem : function() {
+			return _this.inventoryItem;
+		},
+		setInventoryItem : function(inventoryItem) {
+			_this.inventoryItem = inventoryItem;
+		},
+		getModelId : function() {
+			return _this.modelId;
+		},
+		setModelId : function(modelId) {
+			_this.modelId = modelId;
+		},
+		setModelInstanceName : function(modelInstanceName) {
+			_this.modelInstanceName = modelInstanceName;
+		},
+		getModelInfo : function(componentId) {
+			return _this.modelInfo[componentId];
+		},
+		setModelInfo : function(componentId, modelInfo) {
+			if (_this.modelInfo === undefined) {
+				_this.modelInfo = new Object;
+			}
+			_this.modelInfo[componentId] = modelInfo;
+		},
+		getNetworkInstanceId : function() {
+			return _this.networkInstanceId;
+		},
+		setNetworkInstanceId : function(networkInstanceId) {
+			_this.networkInstanceId = networkInstanceId;
+		},
+		getServiceIdList : function() {
+			return _this.serviceIdList;
+		},
+		setServiceIdList : function(serviceIdList) {
+			_this.serviceIdList = serviceIdList;
+		},
+		setAicZones : function(aicZones) {
+			_this.aicZones = aicZones;
+		},
+		getAicZones : function(){
+			return _this.aicZones;
+		},
+		getAicZoneForPNF : function(){
+				return _this.aicZone;
+		},
+		getServiceInstanceId : function() {
+			return _this.serviceInstanceId;
+		},
+		setServiceInstanceId : function(serviceInstanceId) {
+			_this.serviceInstanceId = serviceInstanceId;
+		},
+		getServiceInstanceName : function() {
+			return _this.serviceInstanceName;
+		},
+		setServiceInstanceName : function(serviceInstanceName) {
+			_this.serviceInstanceName = serviceInstanceName;
+		},
+		getServiceName : function() {
+			return _this.serviceName;
+		},
+		setServiceName : function(serviceName) {
+			_this.serviceName = serviceName;
+		},
+		getServiceType : function() {
+			return _this.serviceType;
+		},
+		setServiceType : function(serviceType) {
+			_this.serviceType = serviceType;
+		},
+		getServiceUuid : function() {
+			return _this.serviceUuid;
+		},
+		setServiceUuid : function(serviceUuid) {
+			_this.serviceUuid = serviceUuid;
+		},
+		getLoggedInUserId : function() {
+			return _this.loggedInUserId;
+		},
+		setLoggedInUserId : function(loggedInUserId) {
+			_this.loggedInUserId = loggedInUserId;
+		},
+		getSubscriberName : function() {
+			return _this.subscriberName;
+		},
+		setSubscriberName : function(subscriberName) {
+			_this.subscriberName = subscriberName;
+		},
+		getSubscribers : function() {
+			return _this.subscribers;
+		},
+		setSubscribers : function(subscribers) {
+			_this.subscribers = subscribers;
+		},
+		getSubscriptionServiceTypeList : function() {
+			return _this.subscriptionServiceTypeList;
+		},
+		setSubscriptionServiceTypeList : function(subscriptionServiceTypeList) {
+			_this.subscriptionServiceTypeList = subscriptionServiceTypeList;
+		},
+		setUserServiceInstanceName : function(userServiceInstanceName) {
+			_this.userServiceInstanceName = userServiceInstanceName;
+		},
+		getVfModuleInstanceId : function() {
+			return _this.vfModuleInstanceId;
+		},
+		setVfModuleInstanceId : function(vfModuleInstanceId) {
+			_this.vfModuleInstanceId = vfModuleInstanceId;
+		},
+		getVnfInstanceId : function() {
+			return _this.vnfInstanceId;
+		},
+		setVnfInstanceId : function(vnfInstanceId) {
+			_this.vnfInstanceId = vnfInstanceId;
+		},
+		getVfModuleInstanceName : function() {
+				return _this.vfModuleInstanceName;
+		},
+		setVfModuleInstanceName : function(vfModuleInstanceName) {
+				_this.vfModuleInstanceName = vfModuleInstanceName;
+		},
+		getVolumeGroupInstanceId : function() {
+			return _this.volumeGroupInstanceId;
+		},
+		setVolumeGroupInstanceId : function(volumeGroupInstanceId) {
+			_this.volumeGroupInstanceId = volumeGroupInstanceId;
+		},
+		getLcpRegion : function() {
+			return _this.lcpRegion;
+		},
+		setLcpRegion : function(lcpRegion) {
+			_this.lcpRegion = lcpRegion;
+		},
+		getTenant : function() {
+			return _this.tenant;
+		},
+		setTenant : function(tenant) {
+			_this.tenant = tenant;
+		},
+		setServiceInstanceToCustomer : function(serviceInstanceToCustomer) {
+			_this.serviceInstanceToCustomer = [];
+			_this.serviceInstanceToCustomer = serviceInstanceToCustomer;
+		},
+		getMsoRequestParametersTestApi: function(){
+			return sessionStorage.getItem("msoRequestParametersTestApiValue");
+		},
+		setALaCarte : function(aval) {
+			_this.aLaCarte = aval;
+		},
+		getALaCarte : function() {
+			// if not set return true
+			if (_this.aLaCarte === undefined) {
+				return true;
+			}
+			return _this.aLaCarte;
+		},
+		setShouldIncludeInAsyncInstantiationFlow: function (val) {
+				_this.shouldIncludeInAsyncInstantiationFlow = val;
+		},
+		getShouldIncludeInAsyncInstantiationFlow: function(){
+			if (_this.shouldIncludeInAsyncInstantiationFlow === undefined) {
+					return false;
+			}
+			return _this.shouldIncludeInAsyncInstantiationFlow;
+		},
+		setMacro : function(aval) {
+			_this.macro = aval;
+		},
+		getMacro : function() {
+			if (_this.macro === undefined) {
+				return false;
+			}
+			return _this.macro;
+		},
+		getResources : function() {
+			return _this.resources;
+		},
+		setResources : function(r) {
+			_this.resources = r;
+		},
+		getSystemPropProvStatus : function() {
+			return _this.syspropProvStatusList;
+		},
+		setSystemPropProvStatus : function(r) {
+			_this.syspropProvStatusList = r;
+		},
+		getUpdatedVNFProvStatus : function() {
+			return _this.updatedvnfProvStatus;
+		},
+		setUpdatedVNFProvStatus : function(r) {
+			_this.updatedvnfProvStatus = r;
+		},
+		setArbitraryParameters : function (pList) {
+			_this.arbitraryParameters = pList;
+		},
+		getArbitraryParameters : function () {
+			return _this.arbitraryParameters;
+		},
+		setE2EService:function(b){
+			_this.e2eService=b;
+		},
+		getE2EService:function(){
+			return _this.e2eService;
+		},
+		setHideServiceFields:function(b){
+			_this.hideServiceFields=b;
+		},
+		getHideServiceFields:function(){
+			return _this.hideServiceFields;
+		},
+		getServiceProxies:function(){
+            return _this.serviceProxies;
+		},
+		setServiceProxies:function(serviceProxies){
+				 _this.serviceProxies = serviceProxies;
+		},
+		getSourceServiceProxies:function(){
+				return _this.sourceServiceProxies;
+		},
+		setSourceServiceProxies:function(sourceServiceProxies){
+				_this.sourceServiceProxies = sourceServiceProxies;
+		},
+		getCollectorServiceProxies:function(){
+				return _this.collectorServiceProxies;
+		},
+		setCollectorServiceProxies:function(collectorServiceProxies){
+				_this.collectorServiceProxies = collectorServiceProxies;
+		},
+		getConfigurationByPolicy:function() {
+        	return _this.configurationByPolicy;
+		},
+		setConfigurationByPolicy:function (configurationByPolicy) {
+			_this.configurationByPolicy = configurationByPolicy;
+				},
+		getPortMirroningConfigFields:function(){
+				return _this.portMirroningConfigFields;
+		},
+		setPortMirroningConfigFields:function(portMirroningConfigFields){
+				_this.portMirroningConfigFields = portMirroningConfigFields;
+		},
+		getConfigurationInstanceId : function() {
+				return _this.configurationInstanceId;
+		},
+		setConfigurationInstanceId : function(configurationInstanceId) {
+				_this.configurationInstanceId = configurationInstanceId;
+		},
+		getPnf: function () {
+				return _this.pnf;
+		},
+		setPnf: function (pnf) {
+				_this.pnf = pnf;
+		},
+		getOwningEntityProperties: function () {
+				return _this.owningEntityProperties;
+		},
+		setOwningEntityProperties: function (properties) {
+				_this.owningEntityProperties = properties;
+		}
+	};
+};
+
+appDS2.factory("DataService", [ "$log", DataService ]);
diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json
index 013745c90..d602a15e3 100644
--- a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json
+++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json
@@ -331,7 +331,7 @@
         "baseModule": false
       },
       "inputs": {},
-      "volumeGroupAllowed": false
+      "volumeGroupAllowed": true
     },
     "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
       "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
@@ -367,18 +367,18 @@
         "baseModule": true
       },
       "inputs": {},
-      "volumeGroupAllowed": true
+      "volumeGroupAllowed": false
     }
   },
   "volumeGroups": {
-    "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+    "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-1": {
       "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
       "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
       "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
       "description": null,
-      "name": "VfVgeraldine..base_vflorence..module-0",
+      "name": "VfVgeraldine..base_vflorence..module-1",
       "version": "2",
-      "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+      "modelCustomizationName": "VfVgeraldine..base_vflorence..module-1",
       "properties": {
         "minCountInstances": 1,
         "maxCountInstances": 1,
diff --git a/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
index 9f2499f3c..09734472c 100644
--- a/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
@@ -100,20 +100,20 @@ describe('View Edit Page: Upgrade VFModule', function () {
         `servicePlanning/EDIT?serviceModelId=${serviceUuid}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}`);
     });
 
-    it(`Upgrade a VFModule`, function () {
+    it(`Upgrade a VF Module`, function () {
       cy.initDrawingBoardUserPermission();
       initServicePlanning("EDIT",
         '../vid-automation/src/test/resources/viewEdit/ServiceTreeWithMultipleChildren_serviceInstance_withUpdatedLatestVersion.json');
-      upgradeTheVFM();
+      upgradeTheVFM('node-522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1', true);
       assertVfModuleActionInRedux("None_Upgrade");
       undoUpgradeForVFM();
       assertVfModuleActionInRedux("None");
-      upgradeTheVFM();
+      upgradeTheVFM('node-522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1',true);
       cy.getDrawingBoardDeployBtn().click();
       cy.wait('@expectedPostAsyncInstantiation').then(xhr => {
         const requestBody = Object(xhr.request.body);
         const vfModuleRequest = requestBody.vnfs['VNF2_INSTANCE_ID'].vfModules['vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1']['2c1ca484-cbc2-408b-ab86-25a2c15ce280'];
-          expect(requestBody.action).to.equal("None_Upgrade");
+        expect(requestBody.action).to.equal("None_Upgrade");
         expect(requestBody.vnfs['VNF2_INSTANCE_ID'].action).to.equal("None_Upgrade");
         expect(vfModuleRequest.action).to.equal("None_Upgrade");
       });
@@ -129,7 +129,7 @@ describe('View Edit Page: Upgrade VFModule', function () {
 
   });
 
-  describe('More UI tests', () => {
+  describe('More UI test', () => {
 
     beforeEach(() => {
       cy.clearSessionStorage();
@@ -174,7 +174,7 @@ describe('View Edit Page: Upgrade VFModule', function () {
 
       cy.openIframe(`app/ui/#/servicePlanning/EDIT?serviceModelId=${serviceModelId}&subscriberId=${subscriberId}&serviceType=${serviceType}&serviceInstanceId=${serviceInstanceId}`);
 
-      upgradeTheVFM('node-04b21d26-9780-4956-8329-b22b049329f4-xbitestmodulereplace0..XbiTestModuleReplace..base_ocg..module-0');
+      upgradeTheVFM('node-04b21d26-9780-4956-8329-b22b049329f4-xbitestmodulereplace0..XbiTestModuleReplace..base_ocg..module-0', false);
 
       mockAsyncBulkResponse();
       cy.getDrawingBoardDeployBtn().click();
@@ -213,13 +213,18 @@ describe('View Edit Page: Upgrade VFModule', function () {
     }).as("expectLatestServiceModelUpgradeVersion");
   }
 
-  function upgradeTheVFM(treeNodeId = 'node-522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1') {
+  function upgradeTheVFM(treeNodeId: string, shouldVGCheckboxExist :boolean) {
     cy.getElementByDataTestsId(`${treeNodeId}-menu-btn`).click()
     .drawingBoardTreeClickOnContextMenuOptionByName("Upgrade");
     // The following is needed when enabling FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS
 
     cy.getElementByDataTestsId('retainAssignments').click();
-    cy.getElementByDataTestsId('retainVolumeGroups').click();
+    if (shouldVGCheckboxExist) {
+      cy.getElementByDataTestsId('retainVolumeGroups').click();
+    }
+    else {
+      cy.getElementByDataTestsId('retainVolumeGroups').should('not.exist');
+    }
     cy.getElementByDataTestsId('sdncPreLoad').click();
     cy.screenshot();
     cy.getElementByDataTestsId('form-set').click();
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/upgradeVfModule/upgrade_vfmodule_e2e__service_instance.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/upgradeVfModule/upgrade_vfmodule_e2e__service_instance.json
index 3e22bfea9..42ac805e9 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/upgradeVfModule/upgrade_vfmodule_e2e__service_instance.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/upgradeVfModule/upgrade_vfmodule_e2e__service_instance.json
@@ -80,7 +80,7 @@
             "platformName": null,
             "trackById": "b0732bed-3ddf-43cc-b193-7f18db84e476",
             "isBase": true,
-            "volumeGroupName": null
+            "volumeGroupName": "xbitestmodulereplace0..XbiTestModuleReplace..base_ocg..module-0_vol"
           }
         }
       },
@@ -98,4 +98,4 @@
   "existingNetworksCounterMap": {},
   "existingVnfGroupCounterMap": {},
   "existingVRFCounterMap": {}
-}
\ No newline at end of file
+}
diff --git a/vid-webpack-master/package.json b/vid-webpack-master/package.json
index f2f913612..c9113d681 100644
--- a/vid-webpack-master/package.json
+++ b/vid-webpack-master/package.json
@@ -92,7 +92,7 @@
     "hammerjs": "2.0.8",
     "husky": "^1.3.1",
     "istanbul-reports": "2.1.1",
-    "jest": "24.1.0",
+    "jest": "24.9.0",
     "jest-each": "24.0.0",
     "jest-junit": "6.3.0",
     "jest-sonar-reporter": "2.0.0",
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts
index fb1172945..e277cb28c 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts
@@ -10,7 +10,7 @@ import {AaiService} from '../../../shared/services/aaiService/aai.service';
 import {ServiceNodeTypes} from '../../../shared/models/ServiceNodeTypes';
 import {IframeService} from "../../../shared/utils/iframe.service";
 import {DefaultDataGeneratorService} from "../../../shared/services/defaultDataServiceGenerator/default.data.generator.service";
-import {VfModulePopuopService} from "../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
 import {NetworkPopupService} from "../../../shared/components/genericFormPopup/genericFormServices/network/network.popup.service";
 import {createVFModuleInstance} from "../../../shared/storeUtil/utils/vfModule/vfModule.actions";
 import {VnfPopupService} from "../../../shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service";
@@ -56,7 +56,7 @@ export class AvailableModelsTreeComponent {
               private _drawingBoardTreeService: DrawingBoardTreeService,
               private _defaultDataGeneratorService: DefaultDataGeneratorService,
               private _vnfGroupControlGenerator: VnfGroupControlGenerator,
-              private _vfModulePopuopService: VfModulePopuopService,
+              private _vfModulePopuopService: VfModulePopupService,
               private _vnfGroupPopupService: VnfGroupPopupService,
               private _vnfPopupService: VnfPopupService,
               private _networkPopupService: NetworkPopupService,
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts
index f3542573d..4ad1b06cf 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts
@@ -11,7 +11,7 @@ import {IframeService} from "../../../shared/utils/iframe.service";
 import {DuplicateService} from '../duplicate/duplicate.service';
 import {DrawingBoardTreeService, TreeNodeContextMenuModel} from "./drawing-board-tree.service";
 import {NetworkPopupService} from "../../../shared/components/genericFormPopup/genericFormServices/network/network.popup.service";
-import {VfModulePopuopService} from "../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
 import {VnfPopupService} from "../../../shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service";
 import {SdcUiServices} from "onap-ui-angular";
 import {HighlightPipe} from "../../../shared/pipes/highlight/highlight-filter.pipe";
@@ -63,7 +63,7 @@ export class DrawingBoardTreeComponent implements OnInit, AfterViewInit {
               private modalService: SdcUiServices.ModalService,
               private _drawingBoardTreeService: DrawingBoardTreeService,
               private _networkPopupService: NetworkPopupService,
-              private _vfModulePopuopService: VfModulePopuopService,
+              private _vfModulePopuopService: VfModulePopupService,
               private _vnfPopupService: VnfPopupService,
               private _vnfGroupPopupService: VnfGroupPopupService,
               private _errorMsgService: ErrorMsgService,
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/relatedVnfMember/relatedVnfMember.info.model.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/relatedVnfMember/relatedVnfMember.info.model.spec.ts
index a44c21bf0..59ef35abb 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/relatedVnfMember/relatedVnfMember.info.model.spec.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/relatedVnfMember/relatedVnfMember.info.model.spec.ts
@@ -8,7 +8,7 @@ import {NgRedux} from "@angular-redux/store";
 import {AppState} from "../../../../../shared/store/reducers";
 import {DefaultDataGeneratorService} from "../../../../../shared/services/defaultDataServiceGenerator/default.data.generator.service";
 import {DialogService} from "ng2-bootstrap-modal";
-import {VfModulePopuopService} from "../../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "../../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
 import {VnfPopupService} from "../../../../../shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service";
 import {DuplicateService} from "../../../duplicate/duplicate.service";
 import {IframeService} from "../../../../../shared/utils/iframe.service";
@@ -38,7 +38,7 @@ describe('Related Vnf member Model Info', () => {
         MockNgRedux,
         DynamicInputsService,
         DialogService,
-        VfModulePopuopService,
+        VfModulePopupService,
         VfModuleUpgradePopupService,
         VnfPopupService,
         DefaultDataGeneratorService,
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.spec.ts
index 85e57613a..b62794ff8 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.spec.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.spec.ts
@@ -4,7 +4,7 @@ import {MockNgRedux, NgReduxTestingModule} from "@angular-redux/store/testing";
 import {VFModuleModelInfo} from "./vfModule.model.info";
 import {DynamicInputsService} from "../../dynamicInputs.service";
 import {SharedTreeService} from "../../shared.tree.service";
-import {VfModulePopuopService} from "../../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "../../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
 import {DialogService} from "ng2-bootstrap-modal";
 import {NgRedux} from "@angular-redux/store";
 import {AvailableNodeIcons} from "../../../available-models-tree/available-models-tree.service";
@@ -42,7 +42,7 @@ describe('VFModule Model Info', () => {
   let  _sharedTreeService : SharedTreeService;
   let  vfModuleModel: VFModuleModelInfo;
   let _dialogService : DialogService;
-  let _vfModulePopupService : VfModulePopuopService;
+  let _vfModulePopupService : VfModulePopupService;
   let _vfModuleUpgradePopupService : VfModuleUpgradePopupService;
   let _iframeService : IframeService;
   let _componentInfoService : ComponentInfoService;
@@ -56,7 +56,7 @@ describe('VFModule Model Info', () => {
       providers: [
         DynamicInputsService,
         DialogService,
-        VfModulePopuopService,
+        VfModulePopupService,
         VfModuleUpgradePopupService,
         SharedTreeService,
         IframeService,
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts
index 1e4a22c45..bb56b14d0 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts
@@ -10,7 +10,7 @@ import {NgRedux} from "@angular-redux/store";
 import {ITreeNode} from "angular-tree-component/dist/defs/api";
 import {GenericFormPopupComponent, PopupType} from "../../../../../shared/components/genericFormPopup/generic-form-popup.component";
 import {DialogService} from "ng2-bootstrap-modal";
-import {VfModulePopuopService} from "../../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "../../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
 import {AppState} from "../../../../../shared/store/reducers";
 import {MessageBoxData} from "../../../../../shared/components/messageBox/messageBox.data";
 import {MessageBoxService} from "../../../../../shared/components/messageBox/messageBox.service";
@@ -28,7 +28,7 @@ export class VFModuleModelInfo implements ILevelNodeInfo {
   constructor(private _dynamicInputsService: DynamicInputsService,
               private _sharedTreeService: SharedTreeService,
               private _dialogService: DialogService,
-              private _vfModulePopupService: VfModulePopuopService,
+              private _vfModulePopupService: VfModulePopupService,
               private _vfModuleUpgradePopupService: VfModuleUpgradePopupService,
               private _iframeService: IframeService,
               private _featureFlagsService: FeatureFlagsService,
@@ -397,9 +397,9 @@ export class VFModuleModelInfo implements ILevelNodeInfo {
           vfModule : _.cloneDeep(node)
         },
         node,
-        isUpdateMode: false
+        isUpdateMode: true
       });
-    }else {
+    } else {
       this._sharedTreeService.upgradeBottomUp(node, serviceModelId);
       this._store.dispatch(upgradeVFModule(node.data.modelName,  node.parent.data.vnfStoreKey, serviceModelId ,node.data.dynamicModelName));
     }
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.spec.ts
index 3ac6076dc..f700ed419 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.spec.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.spec.ts
@@ -10,7 +10,7 @@ import {NgRedux} from "@angular-redux/store";
 import {AppState} from "../../../../../shared/store/reducers";
 import {DefaultDataGeneratorService} from "../../../../../shared/services/defaultDataServiceGenerator/default.data.generator.service";
 import {DialogService} from "ng2-bootstrap-modal";
-import {VfModulePopuopService} from "../../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "../../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
 import {VnfPopupService} from "../../../../../shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service";
 import {AvailableNodeIcons} from "../../../available-models-tree/available-models-tree.service";
 import {DuplicateService} from "../../../duplicate/duplicate.service";
@@ -38,7 +38,7 @@ describe('Vnf Model Info', () => {
  let _serviceInfoService: ServiceInfoService;
  let _defaultDataGeneratorService : DefaultDataGeneratorService;
  let _dialogService : DialogService;
- let _vfModulePopupService : VfModulePopuopService;
+ let _vfModulePopupService : VfModulePopupService;
  let _vfModuleUpgradePopupService : VfModuleUpgradePopupService;
  let _vnfPopupService : VnfPopupService;
  let _duplicateService : DuplicateService;
@@ -55,7 +55,7 @@ describe('Vnf Model Info', () => {
         MockNgRedux,
         DynamicInputsService,
         DialogService,
-        VfModulePopuopService,
+        VfModulePopupService,
         VfModuleUpgradePopupService,
         VnfPopupService,
         DefaultDataGeneratorService,
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts
index a5a85c41a..355b5c597 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts
@@ -12,7 +12,7 @@ import {DefaultDataGeneratorService} from "../../../../../shared/services/defaul
 import {GenericFormPopupComponent, PopupType} from "../../../../../shared/components/genericFormPopup/generic-form-popup.component";
 import {DialogService} from 'ng2-bootstrap-modal';
 import {VnfPopupService} from "../../../../../shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service";
-import {VfModulePopuopService} from "../../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "../../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
 import {ITreeNode} from "angular-tree-component/dist/defs/api";
 import {AvailableNodeIcons} from "../../../available-models-tree/available-models-tree.service";
 import {DuplicateService} from "../../../duplicate/duplicate.service";
@@ -38,7 +38,7 @@ export class VnfModelInfo implements ILevelNodeInfo {
               private _defaultDataGeneratorService: DefaultDataGeneratorService,
               private _dialogService: DialogService,
               private _vnfPopupService: VnfPopupService,
-              private _vfModulePopupService: VfModulePopuopService,
+              private _vfModulePopupService: VfModulePopupService,
               private _vfModuleUpgradePopupService: VfModuleUpgradePopupService,
               private _duplicateService: DuplicateService,
               private modalService: SdcUiServices.ModalService,
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts
index 9add349db..c17d9c74c 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts
@@ -22,7 +22,7 @@ import {IframeService} from "../../../../shared/utils/iframe.service";
 import {BasicPopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/basic.popup.service";
 import {NetworkPopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/network/network.popup.service";
 import {NetworkControlGenerator} from "../../../../shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator";
-import {VfModulePopuopService} from "../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
 import {VfModuleControlGenerator} from "../../../../shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator";
 import {VnfGroupPopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service";
 import {VnfGroupControlGenerator} from "../../../../shared/components/genericForm/formControlsServices/vnfGroupGenerator/vnfGroup.control.generator";
@@ -73,7 +73,7 @@ describe('Model Tree Generator service', () => {
         BasicPopupService,
         NetworkPopupService,
         NetworkControlGenerator,
-        VfModulePopuopService,
+        VfModulePopupService,
         VfModuleUpgradePopupService,
         VfModuleControlGenerator,
         VnfGroupControlGenerator,
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.spec.ts
index e5559ee15..8674a619e 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.spec.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.spec.ts
@@ -22,7 +22,7 @@ import {IframeService} from "../../../../shared/utils/iframe.service";
 import {BasicPopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/basic.popup.service";
 import {NetworkPopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/network/network.popup.service";
 import {NetworkControlGenerator} from "../../../../shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator";
-import {VfModulePopuopService} from "../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
 import {VfModuleControlGenerator} from "../../../../shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator";
 import {FeatureFlagsService} from "../../../../shared/services/featureFlag/feature-flags.service";
 import {VnfControlGenerator} from "../../../../shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator";
@@ -98,7 +98,7 @@ describe('Model Tree Generator service', () => {
         BasicPopupService,
         NetworkPopupService,
         NetworkControlGenerator,
-        VfModulePopuopService,
+        VfModulePopupService,
         VfModuleUpgradePopupService,
         VfModuleControlGenerator,
         VnfGroupControlGenerator,
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToTree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToTree.service.ts
index 1e6825130..9b68627e2 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToTree.service.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToTree.service.ts
@@ -11,7 +11,7 @@ import {AppState} from "../../../shared/store/reducers";
 import {DialogService} from "ng2-bootstrap-modal";
 import {VnfPopupService} from "../../../shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service";
 import {NetworkPopupService} from "../../../shared/components/genericFormPopup/genericFormServices/network/network.popup.service";
-import {VfModulePopuopService} from "../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
 import {VnfGroupingModelInfo} from "./models/vnfGrouping/vnfGrouping.model.info";
 import {VnfGroupPopupService} from "../../../shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service";
 import {DuplicateService} from "../duplicate/duplicate.service";
@@ -35,7 +35,7 @@ export class ObjectToTreeService {
               private _dialogService : DialogService,
               private _vnfPopupService : VnfPopupService,
               private  _networkPopupService :  NetworkPopupService,
-              private _vfModulePopupService : VfModulePopuopService,
+              private _vfModulePopupService : VfModulePopupService,
               private _vfModuleUpgradePopupService : VfModuleUpgradePopupService,
               private _vnfGroupPopupService : VnfGroupPopupService,
               private _duplicateService : DuplicateService,
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts
index 504dc86bd..277ea941e 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts
@@ -12,7 +12,7 @@ import {BasicControlGenerator} from "../../../shared/components/genericForm/form
 import {AaiService} from "../../../shared/services/aaiService/aai.service";
 import {NetworkPopupService} from "../../../shared/components/genericFormPopup/genericFormServices/network/network.popup.service";
 import {NetworkControlGenerator} from "../../../shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator";
-import {VfModulePopuopService} from "../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
 import {VfModuleControlGenerator} from "../../../shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator";
 import {VnfGroupControlGenerator} from "../../../shared/components/genericForm/formControlsServices/vnfGroupGenerator/vnfGroup.control.generator";
 import {FeatureFlagsService} from "../../../shared/services/featureFlag/feature-flags.service";
@@ -96,7 +96,7 @@ describe('Shared Tree Service', () => {
         DynamicInputsService,
         NetworkPopupService,
         NetworkControlGenerator,
-        VfModulePopuopService,
+        VfModulePopupService,
         VfModuleUpgradePopupService,
         VfModuleControlGenerator,
         VnfGroupControlGenerator,
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.service.spec.ts
index 63c980cd5..514b9bfef 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.service.spec.ts
@@ -17,7 +17,7 @@ import {UUIDData} from "./generic-form-popup.component";
 import {ITreeNode} from "angular-tree-component/dist/defs/api";
 import {NetworkPopupService} from "./genericFormServices/network/network.popup.service";
 import {NetworkControlGenerator} from "../genericForm/formControlsServices/networkGenerator/network.control.generator";
-import {VfModulePopuopService} from "./genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "./genericFormServices/vfModule/vfModule.popup.service";
 import {VfModuleControlGenerator} from "../genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator";
 import {FeatureFlagsService} from "../../services/featureFlag/feature-flags.service";
 import {VfModuleUpgradePopupService} from "./genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service";
@@ -946,7 +946,7 @@ describe('Generic Form popup Service', () => {
   let form : FormGroup;
   let fb : FormBuilder;
   let netwokPopupService : NetworkPopupService;
-  let vfModulePopupService : VfModulePopuopService;
+  let vfModulePopupService : VfModulePopupService;
   let servicePopupService : ServicePopupService;
   let _aaiService : AaiService;
   let _activatedRoute : ActivatedRoute;
@@ -967,7 +967,7 @@ describe('Generic Form popup Service', () => {
         AaiService,
         NetworkPopupService,
         NetworkControlGenerator,
-        VfModulePopuopService,
+        VfModulePopupService,
         VfModuleUpgradePopupService,
         VfModuleControlGenerator,
         {provide:FeatureFlagsService, useClass: MockFeatureFlagsService},
@@ -981,7 +981,7 @@ describe('Generic Form popup Service', () => {
     httpMock = injector.get(HttpTestingController);
     fb = injector.get(FormBuilder);
     netwokPopupService = injector.get(NetworkPopupService);
-    vfModulePopupService = injector.get(VfModulePopuopService);
+    vfModulePopupService = injector.get(VfModulePopupService);
     servicePopupService = injector.get(ServicePopupService);
     _aaiService = injector.get(AaiService);
     _activatedRoute = injector.get(ActivatedRoute);
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.spec.ts
index 6c487102f..935454752 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.spec.ts
@@ -8,7 +8,7 @@ import {FormBuilder} from "@angular/forms";
 import {IframeService} from "../../../../utils/iframe.service";
 import {DefaultDataGeneratorService} from "../../../../services/defaultDataServiceGenerator/default.data.generator.service";
 import {BasicPopupService} from "../basic.popup.service";
-import {VfModulePopuopService} from "./vfModule.popuop.service";
+import {VfModulePopupService} from "./vfModule.popup.service";
 import {VfModuleControlGenerator} from "../../../genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator";
 import {SdcUiServices} from "onap-ui-angular";
 import {FeatureFlagsService} from "../../../../services/featureFlag/feature-flags.service";
@@ -1972,7 +1972,7 @@ class MockFeatureFlagsService {}
 
 describe('VFModule popup service', () => {
   let injector;
-  let service: VfModulePopuopService;
+  let service: VfModulePopupService;
   let genericFormService: GenericFormService
   let defaultDataGeneratorService: DefaultDataGeneratorService;
   let fb: FormBuilder;
@@ -1981,7 +1981,7 @@ describe('VFModule popup service', () => {
   beforeAll(done => (async () => {
     TestBed.configureTestingModule({
       providers : [
-        VfModulePopuopService,
+        VfModulePopupService,
         BasicControlGenerator,
         VfModuleControlGenerator,
         DefaultDataGeneratorService,
@@ -2000,7 +2000,7 @@ describe('VFModule popup service', () => {
     await TestBed.compileComponents();
 
     injector = getTestBed();
-    service = injector.get(VfModulePopuopService);
+    service = injector.get(VfModulePopupService);
     genericFormService = injector.get(GenericFormService);
     defaultDataGeneratorService = injector.get(DefaultDataGeneratorService);
     fb = injector.get(FormBuilder);
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.ts
index 3119cc8f8..6a31bb7ee 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.ts
@@ -34,7 +34,6 @@ export abstract class VfModulePopupServiceBase {
     formValues.modelInfo = new ModelInfo(that.model);
     formValues.uuid = formValues.modelInfo.uuid;
     formValues.isMissingData = false;
-    const vnf = that._store.getState().service.serviceInstance[that.uuidData.serviceId].vnfs[that.uuidData.vnfStoreKey];
 
     if (!that.uuidData.vFModuleStoreKey) {
       this._store.dispatch(createVFModuleInstance(formValues, that.uuidData.modelName, that.uuidData.serviceId, 0, that.uuidData.vnfStoreKey));
@@ -154,7 +153,7 @@ export abstract class VfModulePopupServiceBase {
 }
 
 @Injectable()
-export class VfModulePopuopService extends VfModulePopupServiceBase implements GenericPopupInterface {
+export class VfModulePopupService extends VfModulePopupServiceBase implements GenericPopupInterface {
 
 
   constructor(_basicControlGenerator: BasicControlGenerator,
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts
index bbfe8705e..667e79678 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts
@@ -1,7 +1,7 @@
 import {Injectable} from "@angular/core";
 import {ITreeNode} from "angular-tree-component/dist/defs/api";
 import {FormGroup} from "@angular/forms";
-import {VfModulePopupServiceBase} from "../vfModule/vfModule.popuop.service";
+import {VfModulePopupServiceBase} from "../vfModule/vfModule.popup.service";
 import {upgradeVFModule} from "../../../../storeUtil/utils/vfModule/vfModule.actions";
 import {SharedTreeService} from "../../../../../drawingBoard/service-planning/objectsToTree/shared.tree.service";
 import {NgRedux} from "@angular-redux/store";
@@ -16,11 +16,12 @@ import {FormControlModel} from "../../../../models/formControlModels/formControl
 import {CheckboxFormControl} from "../../../../models/formControlModels/checkboxFormControl.model";
 import {FormControlType} from "../../../../models/formControlModels/formControlTypes.enum";
 import {mergeObjectByPathAction} from "../../../../storeUtil/utils/general/general.actions";
+import * as _ from "lodash";
+import {VfModuleInstance} from "../../../../models/vfModuleInstance";
 
 export enum UpgradeFormControlNames {
   RETAIN_VOLUME_GROUPS = 'retainVolumeGroups',
   RETAIN_ASSIGNMENTS = 'retainAssignments',
-  SDN_C_PRE_LOAD = 'sdncPreLoad',
 }
 
 @Injectable()
@@ -43,11 +44,12 @@ export class VfModuleUpgradePopupService extends VfModulePopupServiceBase {
   getControls(serviceId: string, vnfStoreKey: string, vfModuleStoreKey: string, isUpdateMode: boolean): FormControlModel[]  {
     let result: FormControlModel[] =[
       this.getRetainAssignmentsControl(),
-      this.getRetainVolumeGroupsControl(),
       this._basicControlGenerator.getSDNCControl(null)
     ];
-
-    const vfModuleInstance = this._vfModuleControlGenerator.getVfModuleInstance(serviceId, vnfStoreKey, this.uuidData, isUpdateMode);
+    const vfModuleInstance :VfModuleInstance = this._vfModuleControlGenerator.getVfModuleInstance(serviceId, vnfStoreKey, this.uuidData, isUpdateMode);
+    if(this._store.getState().service.serviceHierarchy[serviceId].vfModules[this.uuidData['modelName']].volumeGroupAllowed){
+      result.push(this.getRetainVolumeGroupsControl());
+    }
     result = this._basicControlGenerator.concatSupplementaryFile(result, vfModuleInstance);
     return result;
   };
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts
index 7c1cc084a..4003b4dcc 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts
@@ -1,6 +1,10 @@
 import {LogService} from "../../../../utils/log/log.service";
 import {NgRedux} from "@angular-redux/store";
-import {BasicControlGenerator, SDN_C_PRE_LOAD, SUPPLEMENTARY_FILE} from "../../../genericForm/formControlsServices/basic.control.generator";
+import {
+  BasicControlGenerator,
+  SDN_C_PRE_LOAD,
+  SUPPLEMENTARY_FILE
+} from "../../../genericForm/formControlsServices/basic.control.generator";
 import {AaiService} from "../../../../services/aaiService/aai.service";
 import {HttpClient} from "@angular/common/http";
 import {GenericFormService} from "../../../genericForm/generic-form.service";
@@ -20,6 +24,7 @@ import {GeneralActions} from "../../../../storeUtil/utils/general/general.action
 import {VfModuleActions} from "../../../../storeUtil/utils/vfModule/vfModule.actions";
 import {ServiceActions} from "../../../../storeUtil/utils/service/service.actions";
 import {FormControlModel} from "../../../../models/formControlModels/formControl.model";
+import * as _ from "lodash";
 
 class MockModalService<T> {}
 
@@ -29,6 +34,15 @@ class MockReduxStore<T> {
   getState() {
     return {
       service: {
+        serviceHierarchy: {
+          serviceId: {
+            vfModules: {
+              vfModuleName: {
+                volumeGroupAllowed: true
+              }
+            }
+          }
+        },
         serviceInstance : {
           serviceId : {
             vnfs : {
@@ -40,7 +54,6 @@ class MockReduxStore<T> {
                     }}}}}}}}
     };
   }
-
   dispatch() {}
 }
 
@@ -101,19 +114,31 @@ describe('VFModule popup service', () => {
     });
   }
 
-  function getControlByNameAndCheckValue(controlName: string, expectedValue: any) {
+  function getControlByNameAndCheckValue(controlName: string, expectedValue: any, shouldControllerExist: boolean) {
     const controls = service.getControls('serviceId', 'vnfStoreKey', 'vfModuleId', true);
     const control = findControlByName(controls, controlName);
-    expect(control).toBeDefined();
-    expect(control.value).toEqual(expectedValue);
+    if(shouldControllerExist){
+      expect(control).toBeDefined();
+      expect(control.value).toEqual(expectedValue);
+    }
+    else{
+      expect(control).toBeUndefined();
+    }
   }
 
   test('get controls should return retainAssignments control with true value', ()=> {
-    getControlByNameAndCheckValue(UpgradeFormControlNames.RETAIN_ASSIGNMENTS, true);
+    getControlByNameAndCheckValue(UpgradeFormControlNames.RETAIN_ASSIGNMENTS, true, true);
   });
 
   test('get controls should return retainVolumeGroup control with true value', ()=> {
-    getControlByNameAndCheckValue(UpgradeFormControlNames.RETAIN_VOLUME_GROUPS, true);
+    getControlByNameAndCheckValue(UpgradeFormControlNames.RETAIN_VOLUME_GROUPS, true, true);
+  });
+
+  test('get controls should NOT return retainVolumeGroup control with true value', ()=> {
+    let stateCopy =_.cloneDeep(store.getState());
+    stateCopy.service.serviceHierarchy['serviceId'].vfModules['vfModuleName'].volumeGroupAllowed = false;
+    jest.spyOn(store, 'getState').mockReturnValue(stateCopy);
+    getControlByNameAndCheckValue(UpgradeFormControlNames.RETAIN_VOLUME_GROUPS, null, false);
   });
 
   test('get controls should contain SUPPLEMENTARY_FILE controller', ()=> {
@@ -196,6 +221,6 @@ describe('VFModule popup service', () => {
 
 
   test( 'get controls should return usePreload with false value', () => {
-    getControlByNameAndCheckValue(SDN_C_PRE_LOAD, false);
+    getControlByNameAndCheckValue(SDN_C_PRE_LOAD, false, true);
   });
 });
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service.spec.ts
index 2f1904468..60f0f361e 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service.spec.ts
@@ -1,7 +1,7 @@
 import {DefaultDataGeneratorService} from "../../../../services/defaultDataServiceGenerator/default.data.generator.service";
 import {NgRedux} from "@angular-redux/store";
 import {IframeService} from "../../../../utils/iframe.service";
-import {VfModulePopuopService} from "../vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "../vfModule/vfModule.popup.service";
 import {FormBuilder} from "@angular/forms";
 import {GenericFormService} from "../../../genericForm/generic-form.service";
 import {BasicPopupService} from "../basic.popup.service";
@@ -2258,7 +2258,7 @@ describe('vnf new popup service', () => {
         AaiService,
         LogService,
         BasicPopupService,
-        VfModulePopuopService,
+        VfModulePopupService,
         VfModuleUpgradePopupService,
         BasicControlGenerator,
         VnfControlGenerator,
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service.spec.ts
index 3a81e5b2b..8ee48e675 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service.spec.ts
@@ -1,7 +1,7 @@
 import {DefaultDataGeneratorService} from "../../../../services/defaultDataServiceGenerator/default.data.generator.service";
 import {NgRedux} from "@angular-redux/store";
 import {IframeService} from "../../../../utils/iframe.service";
-import {VfModulePopuopService} from "../vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "../vfModule/vfModule.popup.service";
 import {FormBuilder} from "@angular/forms";
 import {GenericFormService} from "../../../genericForm/generic-form.service";
 import {BasicPopupService} from "../basic.popup.service";
@@ -2255,7 +2255,7 @@ describe('vnf group new popup service', () => {
         AaiService,
         LogService,
         BasicPopupService,
-        VfModulePopuopService,
+        VfModulePopupService,
         VfModuleUpgradePopupService,
         BasicControlGenerator,
         VnfGroupControlGenerator,
diff --git a/vid-webpack-master/src/app/shared/models/vfModule.ts b/vid-webpack-master/src/app/shared/models/vfModule.ts
index 8f92ba428..dd730609f 100644
--- a/vid-webpack-master/src/app/shared/models/vfModule.ts
+++ b/vid-webpack-master/src/app/shared/models/vfModule.ts
@@ -17,7 +17,6 @@ export interface VFModuleResponseInterface extends NodeModelResponseInterface {
 
 export class VfModule extends NodeModel {
 
-  vgName:string;
   rollbackOnFailure:boolean;
   initial:number;
   customizationUuid: string;
diff --git a/vid-webpack-master/src/app/shared/shared.module.ts b/vid-webpack-master/src/app/shared/shared.module.ts
index 273dff472..0f7c92060 100644
--- a/vid-webpack-master/src/app/shared/shared.module.ts
+++ b/vid-webpack-master/src/app/shared/shared.module.ts
@@ -41,7 +41,7 @@ import {VnfControlGenerator} from "./components/genericForm/formControlsServices
 import {NetworkPopupService} from "./components/genericFormPopup/genericFormServices/network/network.popup.service";
 import {NetworkControlGenerator} from "./components/genericForm/formControlsServices/networkGenerator/network.control.generator";
 import {BasicPopupService} from "./components/genericFormPopup/genericFormServices/basic.popup.service";
-import {VfModulePopuopService} from "./components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "./components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
 import {VfModuleUpgradePopupService} from "./components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service";
 import {VfModuleControlGenerator} from "./components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator";
 import {OrderByPipe} from "./pipes/order/orderBy.pipe";
@@ -193,7 +193,7 @@ import {InstantiationTemplatesService} from "./services/templateService/instanti
     BasicControlGenerator,
     CustomValidators,
     NetworkPopupService,
-    VfModulePopuopService,
+    VfModulePopupService,
     VfModuleUpgradePopupService,
     NetworkControlGenerator,
     VnfGroupControlGenerator,
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.actions.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.actions.ts
index 70c10c429..1b80452cb 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.actions.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.actions.ts
@@ -10,7 +10,7 @@ export enum VfModuleActions {
   UPGRADE_VFMODULE = "UPGRADE_VFMODULE",
   UNDO_UPGRADE_VFMODULE_ACTION = "UNDO_UPGRADE_VFMODULE_ACTION",
   UPDATE_VFMODULE_FEILD = "UPDATE_VFMODULE_FEILD",
-  DELETE_VFMODULE_FEILD = "DELETE_VFMODULE_FEILD",
+  DELETE_VFMODULE_FIELD = "DELETE_VFMODULE_FEILD",
 }
 
 
@@ -163,7 +163,7 @@ export const updateVFModuleField: ActionCreator<UpdateVFModuleField> = (modelNam
 });
 
 export const deleteVFModuleField: ActionCreator<DeleteVFModuleField> = (modelName, vnfStoreKey, serviceId, dynamicModelName, deleteFieldName) => ({
-  type: VfModuleActions.DELETE_VFMODULE_FEILD,
+  type: VfModuleActions.DELETE_VFMODULE_FIELD,
   dynamicModelName,
   modelName,
   vnfStoreKey,
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.spec.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.spec.ts
index 7b890b715..9b3a287a6 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.spec.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.spec.ts
@@ -172,7 +172,7 @@ describe('vfModuleReducer', () => {
       };
       let newState = vfModuleReducer(<any>oldState,
     <DeleteVFModuleField>{
-      type: VfModuleActions.DELETE_VFMODULE_FEILD,
+      type: VfModuleActions.DELETE_VFMODULE_FIELD,
       dynamicModelName: 'dynamicModelName1',
       vnfStoreKey: 'vnfStoreKey',
       serviceId: 'serviceModelId',
diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.ts
index 1bb2b15fd..2e91f8771 100644
--- a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.ts
+++ b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.ts
@@ -155,7 +155,7 @@ export function vfModuleReducer(state: ServiceState , action: Action) : ServiceS
 
       return clonedState;
     }
-    case VfModuleActions.DELETE_VFMODULE_FEILD : {
+    case VfModuleActions.DELETE_VFMODULE_FIELD : {
       let clonedState = _.cloneDeep(state);
       let deleteAction =  <DeleteVFModuleField> action;