Seperating usecase test suite dependencies

  # Refactoring BulkPM Dataplane test suite

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I4b2ad0dc5147e10ffc55f4ec210a29f073cd865b
Issue-ID: INT-832
Signed-off-by: efiacor <fiachra.corcoran@est.tech>

96 files changed, 0 insertions, 9264 deletions

diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/AaiSimulatorApplication.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/AaiSimulatorApplication.java
deleted file mode 100755
index bb1b190d..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/AaiSimulatorApplication.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.cache.annotation.EnableCaching;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@EnableCaching
-@SpringBootApplication(scanBasePackages = {"org.onap"})
-public class AaiSimulatorApplication extends SpringBootServletInitializer {
-    
-    public static void main(final String[] args) {
-        SpringApplication.run(AaiSimulatorApplication.class, args);
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/ApplicationConfigration.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/ApplicationConfigration.java
deleted file mode 100755
index 109be8a8..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/ApplicationConfigration.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.configration;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.net.ssl.SSLContext;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.ssl.SSLContextBuilder;
-import org.onap.so.aaisimulator.utils.CacheName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.concurrent.ConcurrentMapCache;
-import org.springframework.cache.support.SimpleCacheManager;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.core.io.Resource;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.web.client.RestTemplate;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@Configuration
-public class ApplicationConfigration {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationConfigration.class);
-
-
-    @Bean
-    public Jackson2ObjectMapperBuilderCustomizer jacksonCustomizer() {
-        return (mapperBuilder) -> mapperBuilder.modulesToInstall(new JaxbAnnotationModule());
-    }
-
-    @Bean
-    public CacheManager cacheManager() {
-        final SimpleCacheManager manager = new SimpleCacheManager();
-
-        final List<Cache> caches = new ArrayList<>();
-        for (final CacheName cacheName : CacheName.values()) {
-            caches.add(getCache(cacheName.getName()));
-        }
-        manager.setCaches(caches);
-        return manager;
-    }
-
-    private Cache getCache(final String name) {
-        LOGGER.info("Creating cache with name: {}", name);
-        return new ConcurrentMapCache(name);
-    }
-
-    @Profile("!test")
-    @Bean
-    public RestTemplate restTemplate(@Value("${http.client.ssl.trust-store:#{null}}") final Resource trustStore,
-            @Value("${http.client.ssl.trust-store-password:#{null}}") final String trustStorePassword)
-            throws Exception {
-        LOGGER.info("Setting up RestTemplate .... ");
-        final RestTemplate restTemplate = new RestTemplate();
-
-        final HttpComponentsClientHttpRequestFactory factory =
-                new HttpComponentsClientHttpRequestFactory(httpClient(trustStore, trustStorePassword));
-
-        restTemplate.setRequestFactory(factory);
-        return restTemplate;
-    }
-
-    private CloseableHttpClient httpClient(final Resource trustStore, final String trustStorePassword)
-            throws Exception {
-        LOGGER.info("Creating SSLConnectionSocketFactory with custom SSLContext and HostnameVerifier ... ");
-        return HttpClients.custom().setSSLSocketFactory(getSSLConnectionSocketFactory(trustStore, trustStorePassword))
-                .build();
-    }
-
-    private SSLConnectionSocketFactory getSSLConnectionSocketFactory(final Resource trustStore,
-            final String trustStorePassword) throws Exception {
-        return new SSLConnectionSocketFactory(getSslContext(trustStore, trustStorePassword));
-    }
-
-    private SSLContext getSslContext(final Resource trustStore, final String trustStorePassword)
-            throws Exception, Exception {
-        return new SSLContextBuilder().loadTrustMaterial(trustStore.getURL(), trustStorePassword.toCharArray()).build();
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/WebSecurityConfigImpl.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/WebSecurityConfigImpl.java
deleted file mode 100755
index 1dc483f7..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/WebSecurityConfigImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.configration;
-
-import org.onap.so.aaisimulator.utils.Constants;
-import org.onap.so.simulator.configuration.SimulatorSecurityConfigurer;
-import org.onap.so.simulator.model.UserCredentials;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfigImpl extends SimulatorSecurityConfigurer {
-
-    @Autowired
-    public WebSecurityConfigImpl(final UserCredentials userCredentials) {
-        super(userCredentials.getUsers());
-    }
-
-    @Override
-    protected void configure(final HttpSecurity http) throws Exception {
-        http.csrf().disable().authorizeRequests().antMatchers(Constants.BUSINESS_URL + "/**/**").authenticated().and()
-                .httpBasic();
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/AaiSimulatorController.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/AaiSimulatorController.java
deleted file mode 100755
index f5912908..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/AaiSimulatorController.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.onap.so.aaisimulator.utils.Constants.HEALTHY;
-import javax.ws.rs.core.MediaType;
-import org.onap.so.aaisimulator.utils.Constants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@Controller
-@RequestMapping(path = Constants.BASE_URL)
-public class AaiSimulatorController {
-    private static final Logger LOGGER = LoggerFactory.getLogger(AaiSimulatorController.class);
-
-    @ResponseBody
-    @GetMapping(value = "/healthcheck", produces = MediaType.TEXT_PLAIN)
-    @ResponseStatus(code = HttpStatus.OK)
-    public String healthCheck() {
-        LOGGER.info("Running health check ...");
-        return HEALTHY;
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/BusinessController.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/BusinessController.java
deleted file mode 100755
index 4a0ed1b9..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/BusinessController.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.onap.so.aaisimulator.utils.Constants.BI_DIRECTIONAL_RELATIONSHIP_LIST_URL;
-import static org.onap.so.aaisimulator.utils.Constants.CUSTOMER_TYPE;
-import static org.onap.so.aaisimulator.utils.Constants.CUSTOMER_URL;
-import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF;
-import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF_VNF_ID;
-import static org.onap.so.aaisimulator.utils.Constants.SERVICE_RESOURCE_TYPE;
-import static org.onap.so.aaisimulator.utils.Constants.SERVICE_SUBSCRIPTION;
-import static org.onap.so.aaisimulator.utils.Constants.X_HTTP_METHOD_OVERRIDE;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getRequestErrorResponseEntity;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getResourceVersion;
-import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import org.onap.aai.domain.yang.Customer;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.GenericVnfs;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.ServiceInstance;
-import org.onap.aai.domain.yang.ServiceInstances;
-import org.onap.aai.domain.yang.ServiceSubscription;
-import org.onap.so.aaisimulator.models.NodeServiceInstance;
-import org.onap.so.aaisimulator.service.providers.CustomerCacheServiceProvider;
-import org.onap.so.aaisimulator.service.providers.GenericVnfCacheServiceProvider;
-import org.onap.so.aaisimulator.service.providers.NodesCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@Controller
-@RequestMapping(path = CUSTOMER_URL)
-public class BusinessController {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(BusinessController.class);
-    private final CustomerCacheServiceProvider cacheServiceProvider;
-    private final NodesCacheServiceProvider nodesCacheServiceProvider;
-    private final GenericVnfCacheServiceProvider genericVnfCacheServiceProvider;
-
-    @Autowired
-    public BusinessController(final CustomerCacheServiceProvider cacheServiceProvider,
-            final NodesCacheServiceProvider nodesCacheServiceProvider,
-            final GenericVnfCacheServiceProvider genericVnfCacheServiceProvider) {
-        this.cacheServiceProvider = cacheServiceProvider;
-        this.nodesCacheServiceProvider = nodesCacheServiceProvider;
-        this.genericVnfCacheServiceProvider = genericVnfCacheServiceProvider;
-    }
-
-    @GetMapping(value = "{global-customer-id}", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getCustomer(@PathVariable("global-customer-id") final String globalCustomerId,
-            final HttpServletRequest request) {
-        LOGGER.info("Will retrieve customer for 'global customer id': {} ...", globalCustomerId);
-
-        final Optional<Customer> optional = cacheServiceProvider.getCustomer(globalCustomerId);
-        if (optional.isPresent()) {
-            final Customer customer = optional.get();
-            LOGGER.info("found customer {} in cache", customer);
-            return ResponseEntity.ok(customer);
-        }
-
-        LOGGER.error("Couldn't find {} in cache", globalCustomerId);
-        return getRequestErrorResponseEntity(request, CUSTOMER_TYPE);
-    }
-
-    @PutMapping(value = "/{global-customer-id}", consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putCustomer(@RequestBody final Customer customer,
-            @PathVariable("global-customer-id") final String globalCustomerId, final HttpServletRequest request) {
-        LOGGER.info("Will put customer for 'global customer id': {} ...", globalCustomerId);
-
-        if (customer.getResourceVersion() == null || customer.getResourceVersion().isEmpty()) {
-            customer.setResourceVersion(getResourceVersion());
-
-        }
-        cacheServiceProvider.putCustomer(globalCustomerId, customer);
-        return ResponseEntity.accepted().build();
-
-    }
-
-    @GetMapping(value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getCustomer(@PathVariable("global-customer-id") final String globalCustomerId,
-            @PathVariable("service-type") final String serviceType, final HttpServletRequest request) {
-        LOGGER.info("Will retrieve service subscription for 'global customer id': {} and 'service type': {} ...",
-                globalCustomerId, serviceType);
-
-        final Optional<ServiceSubscription> optional =
-                cacheServiceProvider.getServiceSubscription(globalCustomerId, serviceType);
-        if (optional.isPresent()) {
-            final ServiceSubscription serviceSubscription = optional.get();
-            LOGGER.info("found service subscription  {} in cache", serviceSubscription);
-            return ResponseEntity.ok(serviceSubscription);
-        }
-
-        LOGGER.error("Couldn't find 'global customer id': {} and 'service type': {} in cache", globalCustomerId,
-                serviceType);
-        return getRequestErrorResponseEntity(request, SERVICE_SUBSCRIPTION);
-    }
-
-    @PutMapping(value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putServiceSubscription(@PathVariable("global-customer-id") final String globalCustomerId,
-            @PathVariable("service-type") final String serviceType,
-            @RequestBody final ServiceSubscription serviceSubscription, final HttpServletRequest request) {
-        LOGGER.info("Will add service subscription for 'global customer id': {} and 'service type': {} ...",
-                globalCustomerId, serviceType);
-
-        if (cacheServiceProvider.putServiceSubscription(globalCustomerId, serviceType, serviceSubscription)) {
-            LOGGER.info("Successfully add service subscription in cache ...");
-            return ResponseEntity.accepted().build();
-        }
-
-        LOGGER.error("Couldn't add service subscription using 'global customer id': {} and 'service type': {}",
-                globalCustomerId, serviceType);
-        return getRequestErrorResponseEntity(request, SERVICE_SUBSCRIPTION);
-    }
-
-    @GetMapping(
-            value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getSericeInstances(@PathVariable("global-customer-id") final String globalCustomerId,
-            @PathVariable("service-type") final String serviceType,
-            @RequestParam(name = "service-instance-name") final String serviceInstanceName,
-            @RequestParam(name = "depth", required = false) final Integer depth, final HttpServletRequest request) {
-
-        LOGGER.info(
-                "Will retrieve service instances for 'global customer id': {}, 'service type': {} and 'service instance name: '{} with depth: {}...",
-                globalCustomerId, serviceType, serviceInstanceName, depth);
-
-        final Optional<ServiceInstances> optional =
-                cacheServiceProvider.getServiceInstances(globalCustomerId, serviceType, serviceInstanceName);
-        if (optional.isPresent()) {
-            final ServiceInstances serviceInstances = optional.get();
-            LOGGER.info("found service instance  {} in cache", serviceInstances);
-            return ResponseEntity.ok(serviceInstances);
-        }
-        LOGGER.error(
-                "Couldn't find 'global customer id': {}, 'service type': {} and 'service instance name': {} with depth: {} in cache",
-                globalCustomerId, serviceType, serviceInstanceName, depth);
-        return getRequestErrorResponseEntity(request);
-    }
-
-    @GetMapping(
-            value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getSericeInstance(@PathVariable("global-customer-id") final String globalCustomerId,
-            @PathVariable("service-type") final String serviceType,
-            @PathVariable(name = "service-instance-id") final String serviceInstanceId,
-            @RequestParam(name = "depth", required = false) final Integer depth,
-            @RequestParam(name = "resultIndex", required = false) final Integer resultIndex,
-            @RequestParam(name = "resultSize", required = false) final Integer resultSize,
-            @RequestParam(name = "format", required = false) final String format, final HttpServletRequest request) {
-
-        LOGGER.info(
-                "Will retrieve service instances for 'global customer id': {}, 'service type': {} and 'service instance id: '{} with depth: {}, resultIndex:{}, resultSize: {} and format: {}...",
-                globalCustomerId, serviceType, serviceInstanceId, depth, resultIndex, resultSize, format);
-
-        final Optional<ServiceInstance> optional =
-                cacheServiceProvider.getServiceInstance(globalCustomerId, serviceType, serviceInstanceId);
-        if (optional.isPresent()) {
-            final ServiceInstance serviceInstance = optional.get();
-            LOGGER.info("found service instance  {} in cache", serviceInstance);
-            return ResponseEntity.ok(serviceInstance);
-        }
-        LOGGER.error(
-                "Couldn't find 'global customer id': {}, 'service type': {} and 'service instance id': {} with depth: {}, resultIndex:{}, resultSize: {} and format: {} in cache",
-                globalCustomerId, serviceType, serviceInstanceId, depth, resultIndex, resultSize, format);
-        return getRequestErrorResponseEntity(request);
-    }
-
-    @PutMapping(
-            value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putSericeInstance(@PathVariable("global-customer-id") final String globalCustomerId,
-            @PathVariable("service-type") final String serviceType,
-            @PathVariable(name = "service-instance-id") final String serviceInstanceId,
-            @RequestHeader(value = X_HTTP_METHOD_OVERRIDE, required = false) final String invocationId,
-            @RequestBody final ServiceInstance serviceInstance, final HttpServletRequest request) {
-
-        LOGGER.info(
-                "Will add service instance for 'global customer id': {}, 'service type': {} and 'service instance id: '{} ...",
-                globalCustomerId, serviceType, serviceInstanceId);
-
-        if (serviceInstance.getResourceVersion() == null || serviceInstance.getResourceVersion().isEmpty()) {
-            serviceInstance.setResourceVersion(getResourceVersion());
-        }
-
-        if (cacheServiceProvider.putServiceInstance(globalCustomerId, serviceType, serviceInstanceId,
-                serviceInstance)) {
-            nodesCacheServiceProvider.putNodeServiceInstance(serviceInstanceId, new NodeServiceInstance(
-                    globalCustomerId, serviceType, serviceInstanceId, SERVICE_RESOURCE_TYPE, request.getRequestURI()));
-            return ResponseEntity.accepted().build();
-        }
-
-        LOGGER.error("Couldn't add 'global customer id': {}, 'service type': {} and 'service instance id': {} to cache",
-                globalCustomerId, serviceType, serviceInstanceId);
-        return getRequestErrorResponseEntity(request);
-    }
-
-    @PostMapping(
-            value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> patchSericeInstance(@PathVariable("global-customer-id") final String globalCustomerId,
-            @PathVariable("service-type") final String serviceType,
-            @PathVariable(name = "service-instance-id") final String serviceInstanceId,
-            @RequestHeader(value = X_HTTP_METHOD_OVERRIDE, required = false) final String xHttpHeaderOverride,
-            @RequestBody final ServiceInstance serviceInstance, final HttpServletRequest request) {
-
-        LOGGER.info(
-                "Will post service instance for 'global customer id': {}, 'service type': {}, 'service instance id: '{} and '{}': {}...",
-                globalCustomerId, serviceType, serviceInstanceId, X_HTTP_METHOD_OVERRIDE, xHttpHeaderOverride);
-
-        if (HttpMethod.PATCH.toString().equalsIgnoreCase(xHttpHeaderOverride)) {
-            cacheServiceProvider.patchServiceInstance(globalCustomerId, serviceType, serviceInstanceId,
-                    serviceInstance);
-            return ResponseEntity.accepted().build();
-        }
-        LOGGER.error("{} not supported ... ", xHttpHeaderOverride);
-
-        return getRequestErrorResponseEntity(request);
-    }
-
-
-    @GetMapping(
-            value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/related-to/generic-vnfs",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getRelatedToGenericVnf(@PathVariable("global-customer-id") final String globalCustomerId,
-            @PathVariable("service-type") final String serviceType,
-            @PathVariable(name = "service-instance-id") final String serviceInstanceId,
-            @RequestParam(name = "vnf-name", required = true) final String vnfName, final HttpServletRequest request) {
-
-        LOGGER.info(
-                "Will retrieve generic vnf related to information for 'global customer id': {}, 'service type': {} and 'service instance id: '{} with vnfname: {}...",
-                globalCustomerId, serviceType, serviceInstanceId, vnfName);
-
-        final Optional<Relationship> optional =
-                cacheServiceProvider.getRelationship(globalCustomerId, serviceType, serviceInstanceId, vnfName);
-
-        if (optional.isPresent()) {
-
-            final Relationship relationship = optional.get();
-            final Optional<RelationshipData> relationshipDataOptional = relationship.getRelationshipData().stream()
-                    .filter(existing -> GENERIC_VNF_VNF_ID.equals(existing.getRelationshipKey())).findFirst();
-
-            if (relationshipDataOptional.isPresent()) {
-                final RelationshipData relationshipData = relationshipDataOptional.get();
-                final String vnfId = relationshipData.getRelationshipValue();
-                final Optional<GenericVnf> genericVnfOptional = genericVnfCacheServiceProvider.getGenericVnf(vnfId);
-                if (genericVnfOptional.isPresent()) {
-                    final GenericVnfs genericVnfs = new GenericVnfs();
-                    genericVnfs.getGenericVnf().add(genericVnfOptional.get());
-                    LOGGER.info("found service instance  {} in cache", relationship);
-                    return ResponseEntity.ok(genericVnfs);
-                }
-            }
-        }
-        LOGGER.error(
-                "Couldn't find  generic vnf related to information for 'global customer id': {}, 'service type': {} and 'service instance id: '{} with vnfname: {}...",
-                globalCustomerId, serviceType, serviceInstanceId, vnfName);
-        return getRequestErrorResponseEntity(request, GENERIC_VNF);
-    }
-
-    @PutMapping(
-            value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}"
-                    + BI_DIRECTIONAL_RELATIONSHIP_LIST_URL,
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putSericeInstanceRelationShip(
-            @PathVariable("global-customer-id") final String globalCustomerId,
-            @PathVariable("service-type") final String serviceType,
-            @PathVariable(name = "service-instance-id") final String serviceInstanceId,
-            @RequestBody final Relationship relationship, final HttpServletRequest request) {
-
-        LOGGER.info(
-                "Will add {} relationship for 'global customer id': {}, 'service type': {} and 'service instance id: '{} ...",
-                relationship.getRelatedTo(), globalCustomerId, serviceType, serviceInstanceId);
-        final Optional<Relationship> optional = cacheServiceProvider.addRelationShip(globalCustomerId, serviceType,
-                serviceInstanceId, relationship, request.getRequestURI());
-
-        if (optional.isPresent()) {
-            final Relationship resultantRelationship = optional.get();
-            LOGGER.info("Relationship add, sending resultant relationship: {} in response ...", resultantRelationship);
-            return ResponseEntity.accepted().body(resultantRelationship);
-        }
-
-        LOGGER.error(
-                "Couldn't add {} relationship for 'global customer id': {}, 'service type': {} and 'service instance id: '{} ...",
-                relationship.getRelatedTo(), globalCustomerId, serviceType, serviceInstanceId);
-
-        return getRequestErrorResponseEntity(request);
-    }
-
-    @DeleteMapping(
-            value = "/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> deleteSericeInstance(@PathVariable("global-customer-id") final String globalCustomerId,
-            @PathVariable("service-type") final String serviceType,
-            @PathVariable(name = "service-instance-id") final String serviceInstanceId,
-            @RequestParam(name = "resource-version") final String resourceVersion, final HttpServletRequest request) {
-
-        LOGGER.info(
-                "Will delete SericeInstance for 'global-customer-id': {}, 'service-type': {}, 'service-instance-id': {} and 'resource-version': {}",
-                globalCustomerId, serviceType, serviceInstanceId, resourceVersion);
-
-        if (cacheServiceProvider.deleteSericeInstance(globalCustomerId, serviceType, serviceInstanceId,
-                resourceVersion)) {
-            LOGGER.info(
-                    "Successfully deleted SericeInstance from cache for 'global-customer-id': {}, 'service-type': {}, 'service-instance-id': {} and 'resource-version': {}",
-                    globalCustomerId, serviceType, serviceInstanceId, resourceVersion);
-            return ResponseEntity.noContent().build();
-        }
-
-        LOGGER.error(
-                "Unable to delete SericeInstance from cache for 'global-customer-id': {}, 'service-type': {}, 'service-instance-id': {} and 'resource-version': {}",
-                globalCustomerId, serviceType, serviceInstanceId, resourceVersion);
-
-        return getRequestErrorResponseEntity(request);
-
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/CloudRegionsController.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/CloudRegionsController.java
deleted file mode 100755
index 8e007de3..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/CloudRegionsController.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.onap.so.aaisimulator.utils.Constants.BI_DIRECTIONAL_RELATIONSHIP_LIST_URL;
-import static org.onap.so.aaisimulator.utils.Constants.CLOUD_REGION;
-import static org.onap.so.aaisimulator.utils.Constants.CLOUD_REGIONS;
-import static org.onap.so.aaisimulator.utils.Constants.ESR_SYSTEM_INFO_LIST;
-import static org.onap.so.aaisimulator.utils.Constants.RELATIONSHIP_LIST_RELATIONSHIP_URL;
-import static org.onap.so.aaisimulator.utils.Constants.VSERVER;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getHeaders;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getRequestErrorResponseEntity;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getResourceVersion;
-import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import org.onap.aai.domain.yang.CloudRegion;
-import org.onap.aai.domain.yang.EsrSystemInfo;
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.Tenant;
-import org.onap.aai.domain.yang.Vserver;
-import org.onap.so.aaisimulator.models.CloudRegionKey;
-import org.onap.so.aaisimulator.service.providers.CloudRegionCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.HttpServiceUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@Controller
-@RequestMapping(path = CLOUD_REGIONS)
-public class CloudRegionsController {
-    private static final Logger LOGGER = LoggerFactory.getLogger(CloudRegionsController.class);
-
-    private final CloudRegionCacheServiceProvider cacheServiceProvider;
-
-    @Autowired
-    public CloudRegionsController(final CloudRegionCacheServiceProvider cacheServiceProvider) {
-        this.cacheServiceProvider = cacheServiceProvider;
-    }
-
-    @PutMapping(value = "{cloud-owner}/{cloud-region-id}",
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putCloudRegion(@RequestBody final CloudRegion cloudRegion,
-            @PathVariable("cloud-owner") final String cloudOwner,
-            @PathVariable("cloud-region-id") final String cloudRegionId, final HttpServletRequest request) {
-
-        final CloudRegionKey key = new CloudRegionKey(cloudOwner, cloudRegionId);
-
-        if (key.isValid()) {
-            LOGGER.info("Will add CloudRegion to cache with key 'key': {} ....", key);
-            if (cloudRegion.getResourceVersion() == null || cloudRegion.getResourceVersion().isEmpty()) {
-                cloudRegion.setResourceVersion(getResourceVersion());
-            }
-            cacheServiceProvider.putCloudRegion(key, cloudRegion);
-            return ResponseEntity.accepted().build();
-        }
-
-        LOGGER.error("Unable to add CloudRegion in cache because of invalid key {}", key);
-        return getRequestErrorResponseEntity(request, CLOUD_REGION);
-    }
-
-    @GetMapping(value = "{cloud-owner}/{cloud-region-id}",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getCloudRegion(@PathVariable("cloud-owner") final String cloudOwner,
-            @PathVariable("cloud-region-id") final String cloudRegionId,
-            @RequestParam(name = "depth", required = false) final Integer depth, final HttpServletRequest request) {
-        final CloudRegionKey key = new CloudRegionKey(cloudOwner, cloudRegionId);
-        LOGGER.info("Retrieving CloudRegion using key : {} with depth: {}...", key, depth);
-        if (key.isValid()) {
-            final Optional<CloudRegion> optional = cacheServiceProvider.getCloudRegion(key);
-            if (optional.isPresent()) {
-                final CloudRegion cloudRegion = optional.get();
-                LOGGER.info("found CloudRegion {} in cache", cloudRegion);
-                return ResponseEntity.ok(cloudRegion);
-            }
-        }
-        LOGGER.error("Unable to find CloudRegion in cache using {}", key);
-        return getRequestErrorResponseEntity(request, CLOUD_REGION);
-    }
-
-    @PutMapping(value = "{cloud-owner}/{cloud-region-id}" + BI_DIRECTIONAL_RELATIONSHIP_LIST_URL,
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putRelationShip(@PathVariable("cloud-owner") final String cloudOwner,
-            @PathVariable("cloud-region-id") final String cloudRegionId, @RequestBody final Relationship relationship,
-            final HttpServletRequest request) {
-        LOGGER.info("Will add {} relationship to : {} ...", relationship.getRelatedTo());
-
-        final CloudRegionKey key = new CloudRegionKey(cloudOwner, cloudRegionId);
-
-        final Optional<Relationship> optional =
-                cacheServiceProvider.addRelationShip(key, relationship, request.getRequestURI());
-
-        if (optional.isPresent()) {
-            final Relationship resultantRelationship = optional.get();
-            LOGGER.info("Relationship add, sending resultant relationship: {} in response ...", resultantRelationship);
-            return ResponseEntity.accepted().body(resultantRelationship);
-        }
-
-        LOGGER.error("Couldn't add {} relationship for 'key': {} ...", relationship.getRelatedTo(), key);
-        return getRequestErrorResponseEntity(request, VSERVER);
-
-    }
-
-    @PutMapping(value = "{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}",
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putTenant(@RequestBody final Tenant tenant,
-            @PathVariable("cloud-owner") final String cloudOwner,
-            @PathVariable("cloud-region-id") final String cloudRegionId,
-            @PathVariable("tenant-id") final String tenantId, final HttpServletRequest request) {
-
-        final CloudRegionKey key = new CloudRegionKey(cloudOwner, cloudRegionId);
-
-        if (key.isValid()) {
-            LOGGER.info("Will add Tenant to cache with key 'key': {} ....", key);
-            if (tenant.getResourceVersion() == null || tenant.getResourceVersion().isEmpty()) {
-                tenant.setResourceVersion(getResourceVersion());
-            }
-            if (cacheServiceProvider.putTenant(key, tenantId, tenant)) {
-                return ResponseEntity.accepted().build();
-            }
-        }
-
-        LOGGER.error("Unable to add Tenant in cache using key {}", key);
-        return getRequestErrorResponseEntity(request, CLOUD_REGION);
-    }
-
-    @GetMapping(value = "{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getTenant(@PathVariable("cloud-owner") final String cloudOwner,
-            @PathVariable("cloud-region-id") final String cloudRegionId,
-            @PathVariable("tenant-id") final String tenantId, final HttpServletRequest request) {
-        final CloudRegionKey key = new CloudRegionKey(cloudOwner, cloudRegionId);
-        LOGGER.info("Retrieving Tenant using key : {} and tenant-id:{} ...", key, tenantId);
-        if (key.isValid()) {
-            final Optional<Tenant> optional = cacheServiceProvider.getTenant(key, tenantId);
-            if (optional.isPresent()) {
-                final Tenant tenant = optional.get();
-                LOGGER.info("found Tenant {} in cache", tenant);
-                return ResponseEntity.ok(tenant);
-            }
-        }
-        LOGGER.error("Unable to find Tenant in cache key : {} and tenant-id:{} ...", key, tenantId);
-        return getRequestErrorResponseEntity(request, CLOUD_REGION);
-    }
-
-    @PutMapping(
-            value = "{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}" + RELATIONSHIP_LIST_RELATIONSHIP_URL,
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putRelationShip(@RequestBody final Relationship relationship,
-            @PathVariable("cloud-owner") final String cloudOwner,
-            @PathVariable("cloud-region-id") final String cloudRegionId,
-            @PathVariable("tenant-id") final String tenantId, final HttpServletRequest request) {
-
-        final CloudRegionKey key = new CloudRegionKey(cloudOwner, cloudRegionId);
-        LOGGER.info("Will put RelationShip for key : {} and tenant-id:{} ...", key, tenantId);
-
-        if (relationship.getRelatedLink() != null) {
-            final String targetBaseUrl = HttpServiceUtils.getBaseUrl(request).toString();
-            final HttpHeaders incomingHeader = getHeaders(request);
-            final boolean result = cacheServiceProvider.addRelationShip(incomingHeader, targetBaseUrl,
-                    request.getRequestURI(), key, tenantId, relationship);
-            if (result) {
-                LOGGER.info("added created bi directional relationship with {}", relationship.getRelatedLink());
-                return ResponseEntity.accepted().build();
-            }
-
-        }
-        LOGGER.error("Unable to add relationship for related link: {}", relationship.getRelatedLink());
-        return getRequestErrorResponseEntity(request, CLOUD_REGION);
-    }
-
-    @PutMapping(value = "{cloud-owner}/{cloud-region-id}/esr-system-info-list/esr-system-info/{esr-system-info-id}",
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putEsrSystemInfo(@RequestBody final EsrSystemInfo esrSystemInfo,
-            @PathVariable("esr-system-info-id") final String esrSystemInfoId,
-            @PathVariable("cloud-owner") final String cloudOwner,
-            @PathVariable("cloud-region-id") final String cloudRegionId, final HttpServletRequest request) {
-
-        final CloudRegionKey key = new CloudRegionKey(cloudOwner, cloudRegionId);
-
-        LOGGER.info("Will put esrSystemInfo for 'key': {} ...", key);
-
-        if (esrSystemInfo.getResourceVersion() == null || esrSystemInfo.getResourceVersion().isEmpty()) {
-            esrSystemInfo.setResourceVersion(getResourceVersion());
-
-        }
-
-        if (cacheServiceProvider.putEsrSystemInfo(key, esrSystemInfoId, esrSystemInfo)) {
-            LOGGER.info("Successfully added EsrSystemInfo key : {}  ...", key, esrSystemInfo);
-            return ResponseEntity.accepted().build();
-        }
-        LOGGER.error("Unable to add EsrSystemInfo in cache for key : {} ...", key);
-
-        return getRequestErrorResponseEntity(request, ESR_SYSTEM_INFO_LIST);
-    }
-
-    @GetMapping(value = "{cloud-owner}/{cloud-region-id}/esr-system-info-list",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getEsrSystemInfoList(@PathVariable("cloud-owner") final String cloudOwner,
-            @PathVariable("cloud-region-id") final String cloudRegionId, final HttpServletRequest request) {
-        final CloudRegionKey key = new CloudRegionKey(cloudOwner, cloudRegionId);
-        LOGGER.info("Retrieving EsrSystemInfoList using key : {} ...", key);
-        if (key.isValid()) {
-            final Optional<EsrSystemInfoList> optional = cacheServiceProvider.getEsrSystemInfoList(key);
-            if (optional.isPresent()) {
-                final EsrSystemInfoList esrSystemInfoList = optional.get();
-                LOGGER.info("found EsrSystemInfoList {} in cache", esrSystemInfoList);
-                return ResponseEntity.ok(esrSystemInfoList);
-            }
-        }
-        LOGGER.error("Unable to find EsrSystemInfoList in cache using key : {} ...", key);
-        return getRequestErrorResponseEntity(request, CLOUD_REGION);
-    }
-
-    @PutMapping(value = "{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}",
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putVserver(@RequestBody final Vserver vServer,
-            @PathVariable("cloud-owner") final String cloudOwner,
-            @PathVariable("cloud-region-id") final String cloudRegionId,
-            @PathVariable("tenant-id") final String tenantId, @PathVariable("vserver-id") final String vServerId,
-            final HttpServletRequest request) {
-
-        final CloudRegionKey key = new CloudRegionKey(cloudOwner, cloudRegionId);
-        if (vServer.getResourceVersion() == null || vServer.getResourceVersion().isEmpty()) {
-            vServer.setResourceVersion(getResourceVersion());
-        }
-        LOGGER.info("Will put Vserver in cache using using key: {}, tenantId: {}, vServerId: {} ...", key, tenantId,
-                vServerId);
-
-        if (cacheServiceProvider.putVserver(key, tenantId, vServerId, vServer)) {
-
-            if (vServer.getRelationshipList() != null) {
-                for (final Relationship relationship : vServer.getRelationshipList().getRelationship()) {
-                    if (relationship.getRelatedLink() != null) {
-                        final String requestUri = request.getRequestURI();
-                        final String targetBaseUrl =
-                                HttpServiceUtils.getBaseUrl(request.getRequestURL(), requestUri).toString();
-                        final HttpHeaders incomingHeader = getHeaders(request);
-                        final boolean result = cacheServiceProvider.addVServerRelationShip(incomingHeader,
-                                targetBaseUrl, requestUri, key, tenantId, vServerId, relationship);
-                        if (!result) {
-                            LOGGER.error(
-                                    "Unable to add Vserver relationship in cache using key: {}, tenantId: {}, vServerId: {}",
-                                    key, tenantId, vServerId);
-                            return getRequestErrorResponseEntity(request, CLOUD_REGION);
-                        }
-                        LOGGER.info("Successfully added relationship with {}", relationship.getRelatedLink());
-                    }
-                }
-            }
-
-            LOGGER.info("Successfully added Vserver for key: {}, tenantId: {}, vServerId: {} ...", key, tenantId,
-                    vServerId);
-            return ResponseEntity.accepted().build();
-        }
-        LOGGER.error("Unable to add Vserver in cache using key: {}, tenantId: {}, vServerId: {}", key, tenantId,
-                vServerId);
-        return getRequestErrorResponseEntity(request, CLOUD_REGION);
-    }
-
-    @GetMapping(value = "{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getVserver(@PathVariable("cloud-owner") final String cloudOwner,
-            @PathVariable("cloud-region-id") final String cloudRegionId,
-            @PathVariable("tenant-id") final String tenantId, @PathVariable("vserver-id") final String vServerId,
-            final HttpServletRequest request) {
-
-        final CloudRegionKey key = new CloudRegionKey(cloudOwner, cloudRegionId);
-        LOGGER.info("Retrieving Vserver using key: {}, tenant-id: {}  and vserver-id: {}...", key, tenantId, vServerId);
-        final Optional<Vserver> optional = cacheServiceProvider.getVserver(key, tenantId, vServerId);
-        if (optional.isPresent()) {
-            final Vserver vServer = optional.get();
-            LOGGER.info("found Vserver {} in cache", vServer);
-            return ResponseEntity.ok(vServer);
-        }
-        LOGGER.error("Unable to find Vserver in cache using key: {}, tenant-id: {}  and vserver-id: {}...", key,
-                tenantId, vServerId);
-        return getRequestErrorResponseEntity(request, CLOUD_REGION);
-    }
-
-
-    @DeleteMapping(value = "{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> deleteVserver(@PathVariable("cloud-owner") final String cloudOwner,
-            @PathVariable("cloud-region-id") final String cloudRegionId,
-            @PathVariable("tenant-id") final String tenantId, @PathVariable("vserver-id") final String vServerId,
-            @RequestParam(name = "resource-version") final String resourceVersion, final HttpServletRequest request) {
-
-        final CloudRegionKey key = new CloudRegionKey(cloudOwner, cloudRegionId);
-        LOGGER.info("Will delete Vserver using key: {}, tenant-id: {}, vserver-id: {} and resource-version: {}...", key,
-                tenantId, vServerId, resourceVersion);
-
-
-        if (cacheServiceProvider.deleteVserver(key, tenantId, vServerId, resourceVersion)) {
-            LOGGER.info(
-                    "Successfully delete Vserver from cache for key: {}, tenant-id: {}, vserver-id: {} and resource-version: {}",
-                    key, tenantId, vServerId, resourceVersion);
-            return ResponseEntity.noContent().build();
-        }
-
-        LOGGER.error(
-                "Unable to delete Vserver from cache using key: {}, tenant-id: {}, vserver-id: {} and resource-version: {} ...",
-                key, tenantId, vServerId, resourceVersion);
-        return getRequestErrorResponseEntity(request, CLOUD_REGION);
-    }
-
-    @PutMapping(
-            value = "{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}"
-                    + RELATIONSHIP_LIST_RELATIONSHIP_URL,
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putVserverRelationShip(@PathVariable("cloud-owner") final String cloudOwner,
-            @PathVariable("cloud-region-id") final String cloudRegionId,
-            @PathVariable("tenant-id") final String tenantId, @PathVariable("vserver-id") final String vServerId,
-            @RequestBody final Relationship relationship, final HttpServletRequest request) {
-        final CloudRegionKey key = new CloudRegionKey(cloudOwner, cloudRegionId);
-        LOGGER.info("Will add {} relationship to : {} ...", relationship.getRelatedTo());
-
-        if (relationship.getRelatedLink() != null) {
-            final String targetBaseUrl = HttpServiceUtils.getBaseUrl(request).toString();
-            final HttpHeaders incomingHeader = getHeaders(request);
-            final boolean result = cacheServiceProvider.addVServerRelationShip(incomingHeader, targetBaseUrl,
-                    request.getRequestURI(), key, tenantId, vServerId, relationship);
-            if (result) {
-                LOGGER.info("added created bi directional relationship with {}", relationship.getRelatedLink());
-                return ResponseEntity.accepted().build();
-            }
-        }
-        LOGGER.error("Couldn't add {} relationship for 'key': {} ...", relationship.getRelatedTo(), key);
-        return getRequestErrorResponseEntity(request, CLOUD_REGION);
-
-    }
-
-    @PutMapping(
-            value = "{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}"
-                    + BI_DIRECTIONAL_RELATIONSHIP_LIST_URL,
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putBiDirectionalVServerRelationShip(@PathVariable("cloud-owner") final String cloudOwner,
-            @PathVariable("cloud-region-id") final String cloudRegionId,
-            @PathVariable("tenant-id") final String tenantId, @PathVariable("vserver-id") final String vServerId,
-            @RequestBody final Relationship relationship, final HttpServletRequest request) {
-        final CloudRegionKey key = new CloudRegionKey(cloudOwner, cloudRegionId);
-        LOGGER.info("Will add {} relationship to : {} ...", relationship.getRelatedTo());
-
-        final Optional<Relationship> optional = cacheServiceProvider.addvServerRelationShip(key, tenantId, vServerId,
-                relationship, request.getRequestURI());
-
-        if (optional.isPresent()) {
-            final Relationship resultantRelationship = optional.get();
-            LOGGER.info("Relationship add, sending resultant relationship: {} in response ...", resultantRelationship);
-            return ResponseEntity.accepted().body(resultantRelationship);
-        }
-        LOGGER.error("Couldn't add {} relationship for 'key': {} ...", relationship.getRelatedTo(), key);
-        return getRequestErrorResponseEntity(request, CLOUD_REGION);
-
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrController.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrController.java
deleted file mode 100755
index 297c2eb0..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrController.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.onap.so.aaisimulator.utils.Constants.ESR_SYSTEM_INFO;
-import static org.onap.so.aaisimulator.utils.Constants.ESR_SYSTEM_INFO_LIST;
-import static org.onap.so.aaisimulator.utils.Constants.ESR_VNFM;
-import static org.onap.so.aaisimulator.utils.Constants.EXTERNAL_SYSTEM_ESR_VNFM_LIST_URL;
-import static org.onap.so.aaisimulator.utils.Constants.RELATIONSHIP_LIST_RELATIONSHIP_URL;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getHeaders;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getRequestErrorResponseEntity;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getResourceVersion;
-import java.util.List;
-import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import org.onap.aai.domain.yang.EsrSystemInfo;
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.aai.domain.yang.EsrVnfm;
-import org.onap.aai.domain.yang.EsrVnfmList;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.so.aaisimulator.service.providers.ExternalSystemCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.HttpServiceUtils;
-import org.onap.so.aaisimulator.utils.RequestErrorResponseUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@Controller
-@RequestMapping(path = EXTERNAL_SYSTEM_ESR_VNFM_LIST_URL)
-public class ExternalSystemEsrController {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ExternalSystemEsrController.class);
-
-    private final ExternalSystemCacheServiceProvider cacheServiceProvider;
-
-    @Autowired
-    public ExternalSystemEsrController(final ExternalSystemCacheServiceProvider cacheServiceProvider) {
-        this.cacheServiceProvider = cacheServiceProvider;
-    }
-
-    @PutMapping(value = "/esr-vnfm/{vnfm-id}", consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putEsrVnfm(@RequestBody final EsrVnfm esrVnfm,
-            @PathVariable("vnfm-id") final String vnfmId, final HttpServletRequest request) {
-        LOGGER.info("Will put esr-vnfm to cache for 'vnfm id': {} ...", esrVnfm.getVnfmId());
-
-        if (esrVnfm.getResourceVersion() == null || esrVnfm.getResourceVersion().isEmpty()) {
-            esrVnfm.setResourceVersion(getResourceVersion());
-
-        }
-        cacheServiceProvider.putEsrVnfm(vnfmId, esrVnfm);
-        return ResponseEntity.accepted().build();
-    }
-
-    @GetMapping(value = "/esr-vnfm/{vnfm-id}", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getEsrVnfm(@PathVariable("vnfm-id") final String vnfmId,
-            @RequestParam(name = "depth", required = false) final Integer depth, final HttpServletRequest request) {
-        LOGGER.info("Will retrieve ESR VNFM for 'vnfm id': {} with depth: {}...", vnfmId, depth);
-
-        final Optional<EsrVnfm> optional = cacheServiceProvider.getEsrVnfm(vnfmId);
-        if (optional.isPresent()) {
-            final EsrVnfm esrVnfm = optional.get();
-            LOGGER.info("found esrVnfm {} in cache", esrVnfm);
-            return ResponseEntity.ok(esrVnfm);
-        }
-
-        LOGGER.error("Couldn't Esr Vnfm for 'vnfm id': {} with depth: {}...", vnfmId, depth);
-        return getRequestErrorResponseEntity(request, ESR_VNFM);
-    }
-
-    @GetMapping(produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getEsrVnfmList(final HttpServletRequest request) {
-        LOGGER.info("Will retrieve a list of all ESR VNFMs");
-
-        final List<EsrVnfm> esrVnfms = cacheServiceProvider.getAllEsrVnfm();
-        LOGGER.info("found {} Esr Vnfms in cache", esrVnfms.size());
-
-        final EsrVnfmList esrVnfmList = new EsrVnfmList();
-        esrVnfmList.getEsrVnfm().addAll(esrVnfms);
-
-        return ResponseEntity.ok(esrVnfmList);
-    }
-
-    @PutMapping(value = "/esr-vnfm/{vnfm-id}/esr-system-info-list/esr-system-info/{esr-system-info-id}",
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putEsrSystemInfo(@RequestBody final EsrSystemInfo esrSystemInfo,
-            @PathVariable("vnfm-id") final String vnfmId,
-            @PathVariable("esr-system-info-id") final String esrSystemInfoId, final HttpServletRequest request) {
-        LOGGER.info("Will put esrSystemInfo for 'vnfm id': {} and 'esr-system-info-id': {} ...", vnfmId, esrSystemInfo);
-
-        if (esrSystemInfo.getResourceVersion() == null || esrSystemInfo.getResourceVersion().isEmpty()) {
-            esrSystemInfo.setResourceVersion(getResourceVersion());
-
-        }
-
-        if (cacheServiceProvider.putEsrSystemInfo(vnfmId, esrSystemInfoId, esrSystemInfo)) {
-            LOGGER.info("Successfully added EsrSystemInfo for 'vnfm id': {} and 'esr-system-info-id': {} ...", vnfmId,
-                    esrSystemInfo);
-            return ResponseEntity.accepted().build();
-        }
-        LOGGER.error("Unable to add esrSystemInfo for 'vnfm id': {} and 'esr-system-info-id': {} ...", vnfmId,
-                esrSystemInfo);
-        return getRequestErrorResponseEntity(request, ESR_SYSTEM_INFO_LIST);
-    }
-
-    @GetMapping(value = "/esr-vnfm/{vnfm-id}/esr-system-info-list",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getEsrSystemInfoList(@PathVariable("vnfm-id") final String vnfmId,
-            final HttpServletRequest request) {
-        LOGGER.info("Will retrieve esrSystemInfoList for 'vnfm id': {} ...", vnfmId);
-
-        final Optional<EsrSystemInfoList> optional = cacheServiceProvider.getEsrSystemInfoList(vnfmId);
-        if (optional.isPresent()) {
-            final EsrSystemInfoList esrSystemInfoList = optional.get();
-            LOGGER.info("found esrSystemInfoList {} in cache", esrSystemInfoList);
-            return ResponseEntity.ok(esrSystemInfoList);
-        }
-
-        LOGGER.error("Couldn't find esrSystemInfoList for 'vnfm id': {} ...", vnfmId);
-        return getRequestErrorResponseEntity(request, ESR_SYSTEM_INFO);
-    }
-
-    @PutMapping(value = "/esr-vnfm/{vnfm-id}" + RELATIONSHIP_LIST_RELATIONSHIP_URL,
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putEsrVnfmRelationShip(@RequestBody final Relationship relationship,
-            @PathVariable("vnfm-id") final String vnfmId, final HttpServletRequest request) {
-        LOGGER.info("Will put RelationShip for 'vnfm-id': {} ...", vnfmId);
-
-        if (relationship.getRelatedLink() != null) {
-            final String targetBaseUrl = HttpServiceUtils.getBaseUrl(request).toString();
-            final HttpHeaders incomingHeader = getHeaders(request);
-            final boolean result = cacheServiceProvider.addRelationShip(incomingHeader, targetBaseUrl,
-                    request.getRequestURI(), vnfmId, relationship);
-            if (result) {
-                LOGGER.info("added created bi directional relationship with {}", relationship.getRelatedLink());
-                return ResponseEntity.accepted().build();
-            }
-        }
-        LOGGER.error("Unable to add relationship for related link: {}", relationship.getRelatedLink());
-        return RequestErrorResponseUtils.getRequestErrorResponseEntity(request, ESR_VNFM);
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/GenericVnfsController.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/GenericVnfsController.java
deleted file mode 100755
index 43fe47da..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/GenericVnfsController.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.onap.so.aaisimulator.utils.Constants.APPLICATION_MERGE_PATCH_JSON;
-import static org.onap.so.aaisimulator.utils.Constants.BI_DIRECTIONAL_RELATIONSHIP_LIST_URL;
-import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF;
-import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNFS_URL;
-import static org.onap.so.aaisimulator.utils.Constants.RELATIONSHIP_LIST_RELATIONSHIP_URL;
-import static org.onap.so.aaisimulator.utils.Constants.X_HTTP_METHOD_OVERRIDE;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getHeaders;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getRequestErrorResponseEntity;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getResourceVersion;
-import java.util.List;
-import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.GenericVnfs;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.so.aaisimulator.service.providers.GenericVnfCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.HttpServiceUtils;
-import org.onap.so.aaisimulator.utils.RequestErrorResponseUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@Controller
-@RequestMapping(path = GENERIC_VNFS_URL)
-public class GenericVnfsController {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(GenericVnfsController.class);
-
-    private final GenericVnfCacheServiceProvider cacheServiceProvider;
-
-
-    @Autowired
-    public GenericVnfsController(final GenericVnfCacheServiceProvider cacheServiceProvider) {
-        this.cacheServiceProvider = cacheServiceProvider;
-    }
-
-    @PutMapping(value = "/generic-vnf/{vnf-id}", consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putGenericVnf(@RequestBody final GenericVnf genericVnf,
-            @PathVariable("vnf-id") final String vnfId, final HttpServletRequest request) {
-        LOGGER.info("Will add GenericVnf to cache with 'vnf-id': {} ...", vnfId);
-
-        if (genericVnf.getResourceVersion() == null || genericVnf.getResourceVersion().isEmpty()) {
-            genericVnf.setResourceVersion(getResourceVersion());
-
-        }
-        cacheServiceProvider.putGenericVnf(vnfId, genericVnf);
-        return ResponseEntity.accepted().build();
-
-    }
-
-    @GetMapping(value = "/generic-vnf/{vnf-id}", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getGenericVnf(@PathVariable("vnf-id") final String vnfId,
-            @RequestParam(name = "depth", required = false) final Integer depth,
-            @RequestParam(name = "resultIndex", required = false) final Integer resultIndex,
-            @RequestParam(name = "resultSize", required = false) final Integer resultSize,
-            @RequestParam(name = "format", required = false) final String format, final HttpServletRequest request) {
-        LOGGER.info(
-                "Will get GenericVnf for 'vnf-id': {} with depth: {}, resultIndex: {}, resultSize:{}, format: {} ...",
-                vnfId, depth, resultIndex, resultSize, format);
-
-        final Optional<GenericVnf> optional = cacheServiceProvider.getGenericVnf(vnfId);
-
-        if (optional.isPresent()) {
-            final GenericVnf genericVnf = optional.get();
-            LOGGER.info("found GenericVnf {} in cache", genericVnf);
-            return ResponseEntity.ok(genericVnf);
-        }
-
-        LOGGER.error(
-                "Unable to find GenericVnf in cache for 'vnf-id': {} with depth: {}, resultIndex: {}, resultSize:{}, format:{} ...",
-                vnfId, depth, resultIndex, resultSize, format);
-        return getRequestErrorResponseEntity(request, GENERIC_VNF);
-
-    }
-
-    @PutMapping(value = "/generic-vnf/{vnf-id}" + RELATIONSHIP_LIST_RELATIONSHIP_URL,
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putGenericVnfRelationShip(@RequestBody final Relationship relationship,
-            @PathVariable("vnf-id") final String vnfId, final HttpServletRequest request) {
-        LOGGER.info("Will put RelationShip for 'vnf-id': {} ...", vnfId);
-
-        if (relationship.getRelatedLink() != null) {
-            final String targetBaseUrl = HttpServiceUtils.getBaseUrl(request).toString();
-            final HttpHeaders incomingHeader = getHeaders(request);
-            final boolean result = cacheServiceProvider.addRelationShip(incomingHeader, targetBaseUrl,
-                    request.getRequestURI(), vnfId, relationship);
-            if (result) {
-                LOGGER.info("added created bi directional relationship with {}", relationship.getRelatedLink());
-                return ResponseEntity.accepted().build();
-            }
-        }
-        LOGGER.error("Unable to add relationship for related link: {}", relationship.getRelatedLink());
-        return RequestErrorResponseUtils.getRequestErrorResponseEntity(request, GENERIC_VNF);
-    }
-
-    @PutMapping(value = "/generic-vnf/{vnf-id}" + BI_DIRECTIONAL_RELATIONSHIP_LIST_URL,
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putBiDirectionalRelationShip(@RequestBody final Relationship relationship,
-            @PathVariable("vnf-id") final String vnfId, final HttpServletRequest request) {
-        LOGGER.info("Will put RelationShip for 'vnf-id': {} ...", vnfId);
-
-        final Optional<Relationship> optional =
-                cacheServiceProvider.addRelationShip(vnfId, relationship, request.getRequestURI());
-
-        if (optional.isPresent()) {
-            final Relationship resultantRelationship = optional.get();
-            LOGGER.info("Relationship add, sending resultant relationship: {} in response ...", resultantRelationship);
-            return ResponseEntity.accepted().body(resultantRelationship);
-        }
-
-        LOGGER.error("Unable to add relationship for related link: {}", relationship.getRelatedLink());
-        return RequestErrorResponseUtils.getRequestErrorResponseEntity(request, GENERIC_VNF);
-    }
-
-    @PostMapping(value = "/generic-vnf/{vnf-id}",
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, APPLICATION_MERGE_PATCH_JSON},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> patchGenericVnf(@RequestBody final GenericVnf genericVnf,
-            @PathVariable("vnf-id") final String vnfId,
-            @RequestHeader(value = X_HTTP_METHOD_OVERRIDE, required = false) final String xHttpHeaderOverride,
-            final HttpServletRequest request) {
-
-        LOGGER.info("Will post GenericVnf to cache with 'vnf-id': {} and '{}': {} ...", vnfId, X_HTTP_METHOD_OVERRIDE,
-                xHttpHeaderOverride);
-
-        if (HttpMethod.PATCH.toString().equalsIgnoreCase(xHttpHeaderOverride)) {
-            if (cacheServiceProvider.patchGenericVnf(vnfId, genericVnf)) {
-                return ResponseEntity.accepted().build();
-            }
-            LOGGER.error("Unable to apply patch to GenericVnf using 'vnf-id': {} ... ", vnfId);
-            return getRequestErrorResponseEntity(request, GENERIC_VNF);
-        }
-        LOGGER.error("{} not supported ... ", xHttpHeaderOverride);
-
-        return getRequestErrorResponseEntity(request, GENERIC_VNF);
-    }
-
-    @GetMapping(produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getGenericVnfs(@RequestParam(name = "selflink") final String selflink,
-            final HttpServletRequest request) {
-        LOGGER.info("will retrieve GenericVnfs using selflink: {}", selflink);
-
-        final List<GenericVnf> genericVnfList = cacheServiceProvider.getGenericVnfs(selflink);
-
-        if (genericVnfList.isEmpty()) {
-            LOGGER.error("No matching generic vnfs found using selflink: {}", selflink);
-            return getRequestErrorResponseEntity(request, GENERIC_VNF);
-        }
-
-        LOGGER.info("found {} GenericVnfs in cache", genericVnfList.size());
-        final GenericVnfs genericVnfs = new GenericVnfs();
-        genericVnfs.getGenericVnf().addAll(genericVnfList);
-        return ResponseEntity.ok(genericVnfs);
-    }
-
-    @DeleteMapping(value = "/generic-vnf/{vnf-id}", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> deleteGenericVnf(@PathVariable("vnf-id") final String vnfId,
-            @RequestParam(name = "resource-version") final String resourceVersion, final HttpServletRequest request) {
-        LOGGER.info("Will delete GenericVnf for 'vnf-id': {} and 'resource-version': {}", vnfId, resourceVersion);
-
-        if (cacheServiceProvider.deleteGenericVnf(vnfId, resourceVersion)) {
-            LOGGER.info("Successfully delete GenericVnf from cache for 'vnf-id': {} and 'resource-version': {}", vnfId,
-                    resourceVersion);
-            return ResponseEntity.noContent().build();
-        }
-
-        LOGGER.error("Unable to delete GenericVnf for 'vnf-id': {} and 'resource-version': {} ...", vnfId,
-                resourceVersion);
-        return getRequestErrorResponseEntity(request, GENERIC_VNF);
-
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/LinesOfBusinessController.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/LinesOfBusinessController.java
deleted file mode 100755
index b3438d27..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/LinesOfBusinessController.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.onap.so.aaisimulator.utils.Constants.BI_DIRECTIONAL_RELATIONSHIP_LIST_URL;
-import static org.onap.so.aaisimulator.utils.Constants.LINES_OF_BUSINESS_URL;
-import static org.onap.so.aaisimulator.utils.Constants.LINE_OF_BUSINESS;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getRequestErrorResponseEntity;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getResourceVersion;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import org.onap.aai.domain.yang.LineOfBusiness;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.so.aaisimulator.models.Format;
-import org.onap.so.aaisimulator.models.Results;
-import org.onap.so.aaisimulator.service.providers.LinesOfBusinessCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@Controller
-@RequestMapping(path = LINES_OF_BUSINESS_URL)
-public class LinesOfBusinessController {
-    private static final Logger LOGGER = LoggerFactory.getLogger(LinesOfBusinessController.class);
-
-    private final LinesOfBusinessCacheServiceProvider cacheServiceProvider;
-
-    @Autowired
-    public LinesOfBusinessController(final LinesOfBusinessCacheServiceProvider cacheServiceProvider) {
-        this.cacheServiceProvider = cacheServiceProvider;
-    }
-
-    @PutMapping(value = "{line-of-business-name}", consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putLineOfBusiness(@RequestBody final LineOfBusiness lineOfBusiness,
-            @PathVariable("line-of-business-name") final String lineOfBusinessName, final HttpServletRequest request) {
-
-        LOGGER.info("Will add LineOfBusiness to cache with key 'line-of-business-name': {} ...",
-                lineOfBusiness.getLineOfBusinessName());
-
-        if (lineOfBusiness.getResourceVersion() == null || lineOfBusiness.getResourceVersion().isEmpty()) {
-            lineOfBusiness.setResourceVersion(getResourceVersion());
-
-        }
-        cacheServiceProvider.putLineOfBusiness(lineOfBusinessName, lineOfBusiness);
-        return ResponseEntity.accepted().build();
-    }
-
-
-    @GetMapping(value = "{line-of-business-name}", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getLineOfBusiness(@PathVariable("line-of-business-name") final String lineOfBusinessName,
-            @RequestParam(name = "depth", required = false) final Integer depth,
-            @RequestParam(name = "resultIndex", required = false) final Integer resultIndex,
-            @RequestParam(name = "resultSize", required = false) final Integer resultSize,
-            @RequestParam(name = "format", required = false) final String format, final HttpServletRequest request) {
-
-        LOGGER.info(
-                "retrieving Platform for 'platform-name': {} with depth: {}, resultIndex: {}, resultSize:{}, format: {} ...",
-                lineOfBusinessName, depth, resultIndex, resultSize, format);
-
-        final Optional<LineOfBusiness> optional = cacheServiceProvider.getLineOfBusiness(lineOfBusinessName);
-        if (optional.isPresent()) {
-
-            final Format value = Format.forValue(format);
-            switch (value) {
-                case RAW:
-                    final LineOfBusiness platform = optional.get();
-                    LOGGER.info("found LineOfBusiness {} in cache", platform);
-                    return ResponseEntity.ok(platform);
-                case COUNT:
-                    final Map<String, Object> map = new HashMap<>();
-                    map.put(LINE_OF_BUSINESS, 1);
-                    return ResponseEntity.ok(new Results(map));
-                default:
-                    break;
-            }
-            LOGGER.error("invalid format type :{}", format);
-        }
-        LOGGER.error("Unable to find LineOfBusiness in cache using {}", lineOfBusinessName);
-        return getRequestErrorResponseEntity(request, LINE_OF_BUSINESS);
-    }
-
-    @PutMapping(value = "/{line-of-business-name}" + BI_DIRECTIONAL_RELATIONSHIP_LIST_URL,
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putRelationShip(@PathVariable("line-of-business-name") final String lineOfBusinessName,
-            @RequestBody final Relationship relationship, final HttpServletRequest request) {
-        LOGGER.info("Will add {} relationship to : {} ...", relationship.getRelatedTo());
-
-        final Optional<Relationship> optional =
-                cacheServiceProvider.addRelationShip(lineOfBusinessName, relationship, request.getRequestURI());
-
-        if (optional.isPresent()) {
-            final Relationship resultantRelationship = optional.get();
-            LOGGER.info("Relationship add, sending resultant relationship: {} in response ...", resultantRelationship);
-            return ResponseEntity.accepted().body(resultantRelationship);
-        }
-
-        LOGGER.error("Couldn't add {} relationship for 'line-of-business-name': {} ...", relationship.getRelatedTo(),
-                lineOfBusinessName);
-
-        return getRequestErrorResponseEntity(request, LINE_OF_BUSINESS);
-
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/NodesController.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/NodesController.java
deleted file mode 100755
index 21bcae93..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/NodesController.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF;
-import static org.onap.so.aaisimulator.utils.Constants.NODES_URL;
-import static org.onap.so.aaisimulator.utils.Constants.RESOURCE_LINK;
-import static org.onap.so.aaisimulator.utils.Constants.RESOURCE_TYPE;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getRequestErrorResponseEntity;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import org.onap.aai.domain.yang.GenericVnfs;
-import org.onap.aai.domain.yang.ServiceInstance;
-import org.onap.so.aaisimulator.models.Format;
-import org.onap.so.aaisimulator.models.NodeServiceInstance;
-import org.onap.so.aaisimulator.models.Results;
-import org.onap.so.aaisimulator.service.providers.NodesCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@Controller
-@RequestMapping(path = NODES_URL)
-public class NodesController {
-
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(NodesController.class);
-
-    private final NodesCacheServiceProvider cacheServiceProvider;
-
-    @Autowired
-    public NodesController(final NodesCacheServiceProvider cacheServiceProvider) {
-        this.cacheServiceProvider = cacheServiceProvider;
-    }
-
-    @GetMapping(value = "/service-instances/service-instance/{service-instance-id}",
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getProject(@PathVariable(name = "service-instance-id") final String serviceInstanceId,
-            @RequestParam(name = "format", required = false) final String format, final HttpServletRequest request) {
-        LOGGER.info("retrieving service instance using 'service-instance-id': {} and format: {}...", serviceInstanceId,
-                format);
-
-        final Optional<NodeServiceInstance> optional = cacheServiceProvider.getNodeServiceInstance(serviceInstanceId);
-        if (!optional.isPresent()) {
-            LOGGER.error("Couldn't find {} in cache", serviceInstanceId);
-            return getRequestErrorResponseEntity(request);
-        }
-
-        final Format value = Format.forValue(format);
-        final NodeServiceInstance nodeServiceInstance = optional.get();
-        switch (value) {
-            case PATHED:
-                LOGGER.info("found project {} in cache", nodeServiceInstance);
-                final Map<String, Object> map = new LinkedHashMap<>();
-                map.put(RESOURCE_TYPE, nodeServiceInstance.getResourceType());
-                map.put(RESOURCE_LINK, nodeServiceInstance.getResourceLink());
-                return ResponseEntity.ok(new Results(map));
-            case RAW:
-                final Optional<ServiceInstance> serviceInstance =
-                        cacheServiceProvider.getServiceInstance(nodeServiceInstance);
-                if (serviceInstance.isPresent()) {
-                    return ResponseEntity.ok(serviceInstance.get());
-                }
-                LOGGER.error("Unable to find Service instance in cahce using {}", nodeServiceInstance);
-                return getRequestErrorResponseEntity(request);
-            default:
-                break;
-        }
-        LOGGER.error("invalid format type :{}", format);
-        return getRequestErrorResponseEntity(request);
-    }
-
-    @GetMapping(value = "/generic-vnfs", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getGenericVnfs(@RequestParam(name = "vnf-name") final String vnfName,
-            final HttpServletRequest request) {
-        LOGGER.info("will find GenericVnfs for name: {}", vnfName);
-        final Optional<GenericVnfs> optional = cacheServiceProvider.getGenericVnfs(vnfName);
-        if (optional.isPresent()) {
-            LOGGER.info("found matching GenericVnfs for name: {}", vnfName);
-            return ResponseEntity.ok(optional.get());
-        }
-        LOGGER.error("Unable to find GenericVnfs in cahce using {}", vnfName);
-        return getRequestErrorResponseEntity(request, GENERIC_VNF);
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/OwningEntityController.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/OwningEntityController.java
deleted file mode 100755
index c5ade0cb..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/OwningEntityController.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.onap.so.aaisimulator.utils.Constants.OWNING_ENTITY;
-import static org.onap.so.aaisimulator.utils.Constants.OWNING_ENTITY_URL;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getHeaders;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getRequestErrorResponseEntity;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getResourceVersion;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import org.onap.aai.domain.yang.OwningEntity;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.so.aaisimulator.models.Format;
-import org.onap.so.aaisimulator.models.Results;
-import org.onap.so.aaisimulator.service.providers.OwnEntityCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.HttpServiceUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@Controller
-@RequestMapping(path = OWNING_ENTITY_URL)
-public class OwningEntityController {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(OwningEntityController.class);
-
-    private final OwnEntityCacheServiceProvider cacheServiceProvider;
-
-    @Autowired
-    public OwningEntityController(final OwnEntityCacheServiceProvider cacheServiceProvider) {
-        this.cacheServiceProvider = cacheServiceProvider;
-    }
-
-    @PutMapping(value = "{owning-entity-id}", consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putOwningEntity(@RequestBody final OwningEntity owningEntity,
-            @PathVariable("owning-entity-id") final String owningEntityId, final HttpServletRequest request) {
-        LOGGER.info("Will add OwningEntity to cache with key 'owning-entity-id': {} ...",
-                owningEntity.getOwningEntityId());
-
-        if (owningEntity.getResourceVersion() == null || owningEntity.getResourceVersion().isEmpty()) {
-            owningEntity.setResourceVersion(getResourceVersion());
-
-        }
-        cacheServiceProvider.putOwningEntity(owningEntityId, owningEntity);
-        return ResponseEntity.accepted().build();
-    }
-
-    @GetMapping(value = "{owning-entity-id}", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getOwningEntity(@PathVariable("owning-entity-id") final String owningEntityId,
-            @RequestParam(name = "resultIndex", required = false) final Integer resultIndex,
-            @RequestParam(name = "resultSize", required = false) final Integer resultSize,
-            @RequestParam(name = "format", required = false) final String format, final HttpServletRequest request) {
-        LOGGER.info("retrieving owning entity for 'owning-entity-id': {} ...", owningEntityId);
-
-        final Optional<OwningEntity> optional = cacheServiceProvider.getOwningEntity(owningEntityId);
-        if (!optional.isPresent()) {
-            LOGGER.error("Couldn't find {} in cache", owningEntityId);
-            return getRequestErrorResponseEntity(request);
-        }
-
-        final Format value = Format.forValue(format);
-        switch (value) {
-            case RAW:
-                final OwningEntity owningEntity = optional.get();
-                LOGGER.info("found OwningEntity {} in cache", owningEntity);
-                return ResponseEntity.ok(owningEntity);
-            case COUNT:
-                final Map<String, Object> map = new HashMap<>();
-                map.put(OWNING_ENTITY, 1);
-                return ResponseEntity.ok(new Results(map));
-            default:
-                break;
-        }
-        LOGGER.error("invalid format type :{}", format);
-        return getRequestErrorResponseEntity(request);
-    }
-
-    @PutMapping(value = "/{owning-entity-id}/relationship-list/relationship",
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putOwningEntityRelationShip(@RequestBody final Relationship relationship,
-            @PathVariable("owning-entity-id") final String owningEntityId, final HttpServletRequest request) {
-
-        LOGGER.info("adding relationship for owning-entity-id: {} ...", owningEntityId);
-
-        if (relationship.getRelatedLink() != null) {
-            final String targetBaseUrl = HttpServiceUtils.getBaseUrl(request).toString();
-            final HttpHeaders incomingHeader = getHeaders(request);
-
-            final boolean result = cacheServiceProvider.addRelationShip(incomingHeader, targetBaseUrl,
-                    request.getRequestURI(), owningEntityId, relationship);
-            if (result) {
-                LOGGER.info("added created bi directional relationship with {}", relationship.getRelatedLink());
-                return ResponseEntity.accepted().build();
-            }
-        }
-
-        LOGGER.error("Unable to add relationship for related link: {}", relationship.getRelatedLink());
-        return getRequestErrorResponseEntity(request);
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PlatformController.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PlatformController.java
deleted file mode 100755
index 39e35947..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PlatformController.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.onap.so.aaisimulator.utils.Constants.BI_DIRECTIONAL_RELATIONSHIP_LIST_URL;
-import static org.onap.so.aaisimulator.utils.Constants.PLATFORM;
-import static org.onap.so.aaisimulator.utils.Constants.PLATFORMS_URL;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getRequestErrorResponseEntity;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getResourceVersion;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import org.onap.aai.domain.yang.Platform;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.so.aaisimulator.models.Format;
-import org.onap.so.aaisimulator.models.Results;
-import org.onap.so.aaisimulator.service.providers.PlatformCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@Controller
-@RequestMapping(path = PLATFORMS_URL)
-public class PlatformController {
-    private static final Logger LOGGER = LoggerFactory.getLogger(PlatformController.class);
-
-    private final PlatformCacheServiceProvider cacheServiceProvider;
-
-    @Autowired
-    public PlatformController(final PlatformCacheServiceProvider cacheServiceProvider) {
-        this.cacheServiceProvider = cacheServiceProvider;
-    }
-
-    @PutMapping(value = "{platform-name}", consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putPlatform(@RequestBody final Platform platform,
-            @PathVariable("platform-name") final String platformName, final HttpServletRequest request) {
-        LOGGER.info("Will add Platform to cache with key 'platform-name': {} ...", platform.getPlatformName());
-
-        if (platform.getResourceVersion() == null || platform.getResourceVersion().isEmpty()) {
-            platform.setResourceVersion(getResourceVersion());
-
-        }
-        cacheServiceProvider.putPlatform(platformName, platform);
-        return ResponseEntity.accepted().build();
-    }
-
-    @GetMapping(value = "/{platform-name}", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getPlatform(@PathVariable("platform-name") final String platformName,
-            @RequestParam(name = "depth", required = false) final Integer depth,
-            @RequestParam(name = "resultIndex", required = false) final Integer resultIndex,
-            @RequestParam(name = "resultSize", required = false) final Integer resultSize,
-            @RequestParam(name = "format", required = false) final String format, final HttpServletRequest request) {
-
-        LOGGER.info(
-                "retrieving Platform for 'platform-name': {} with depth: {}, resultIndex: {}, resultSize:{}, format: {} ...",
-                platformName, depth, resultIndex, resultSize, format);
-        final Optional<Platform> optional = cacheServiceProvider.getPlatform(platformName);
-        if (optional.isPresent()) {
-
-            final Format value = Format.forValue(format);
-            switch (value) {
-                case RAW:
-                    final Platform platform = optional.get();
-                    LOGGER.info("found Platform {} in cache", platform);
-                    return ResponseEntity.ok(platform);
-                case COUNT:
-                    final Map<String, Object> map = new HashMap<>();
-                    map.put(PLATFORM, 1);
-                    return ResponseEntity.ok(new Results(map));
-                default:
-                    break;
-            }
-            LOGGER.error("invalid format type :{}", format);
-
-        }
-        LOGGER.error("Unable to find Platform in cahce using {}", platformName);
-        return getRequestErrorResponseEntity(request, PLATFORM);
-    }
-
-    @PutMapping(value = "/{platform-name}" + BI_DIRECTIONAL_RELATIONSHIP_LIST_URL,
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putRelationShip(@PathVariable("platform-name") final String platformName,
-            @RequestBody final Relationship relationship, final HttpServletRequest request) {
-        LOGGER.info("Will add {} relationship to : {} ...", relationship.getRelatedTo());
-
-        final Optional<Relationship> optional =
-                cacheServiceProvider.addRelationShip(platformName, relationship, request.getRequestURI());
-
-        if (optional.isPresent()) {
-            final Relationship resultantRelationship = optional.get();
-            LOGGER.info("Relationship add, sending resultant relationship: {} in response ...", resultantRelationship);
-            return ResponseEntity.accepted().body(resultantRelationship);
-        }
-
-        LOGGER.error("Couldn't add {} relationship for 'platform-name': {} ...", relationship.getRelatedTo(),
-                platformName);
-
-        return getRequestErrorResponseEntity(request, PLATFORM);
-
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PnfsController.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PnfsController.java
deleted file mode 100755
index ff0e3dcf..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PnfsController.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-
-import org.onap.aai.domain.yang.v15.Pnf;
-import org.onap.aai.domain.yang.v15.Pnfs;
-import org.onap.so.aaisimulator.service.providers.PnfCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import java.util.List;
-import java.util.Optional;
-
-import static org.onap.so.aaisimulator.utils.Constants.APPLICATION_MERGE_PATCH_JSON;
-import static org.onap.so.aaisimulator.utils.Constants.PNF;
-import static org.onap.so.aaisimulator.utils.Constants.PNFS_URL;
-import static org.onap.so.aaisimulator.utils.Constants.X_HTTP_METHOD_OVERRIDE;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getRequestErrorResponseEntity;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getResourceVersion;
-
-/**
- * @author Raj Gumma (raj.gumma@est.tech)
- */
-@Controller
-@RequestMapping(path = PNFS_URL)
-public class PnfsController {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PnfsController.class);
-
-    private final PnfCacheServiceProvider cacheServiceProvider;
-
-
-    @Autowired
-    public PnfsController(final PnfCacheServiceProvider cacheServiceProvider) {
-        this.cacheServiceProvider = cacheServiceProvider;
-    }
-
-    @PutMapping(value = "/pnf/{pnf-id}", consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putPnf(@RequestBody final Pnf pnf,
-                                    @PathVariable("pnf-id") final String pnfId, final HttpServletRequest request) {
-        LOGGER.info("Will add Pnf to cache with 'pnf-id': {} ...", pnfId);
-
-        if (pnf.getResourceVersion() == null || pnf.getResourceVersion().isEmpty()) {
-            pnf.setResourceVersion(getResourceVersion());
-        }
-        cacheServiceProvider.putPnf(pnfId, pnf);
-        return ResponseEntity.accepted().build();
-    }
-
-    @GetMapping(value = "/pnf/{pnf-id}", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getPnf(@PathVariable("pnf-id") final String pnfId, final HttpServletRequest request) {
-        LOGGER.info("Will get Pnf for 'pnf-id': {} ", pnfId);
-
-        final Optional<Pnf> optional = cacheServiceProvider.getPnf(pnfId);
-
-        if (optional.isPresent()) {
-            final Pnf pnf = optional.get();
-            LOGGER.info("found Pnf {} in cache", pnf);
-            return ResponseEntity.ok(pnf);
-        }
-
-        LOGGER.error("Unable to find Pnf in cache for 'pnf-id': {}", pnfId);
-        return getRequestErrorResponseEntity(request, "pnf");
-
-    }
-
-    @PostMapping(value = "/pnf/{pnf-id}",
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, APPLICATION_MERGE_PATCH_JSON},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> patchPnf(@RequestBody final Pnf pnf,
-                                      @PathVariable("pnf-id") final String pnfId,
-                                      @RequestHeader(value = X_HTTP_METHOD_OVERRIDE, required = false) final String xHttpHeaderOverride,
-                                      final HttpServletRequest request) {
-
-        LOGGER.info("Will post Pnf to cache with 'pnf-id': {} and '{}': {} ...", pnfId, X_HTTP_METHOD_OVERRIDE,
-                xHttpHeaderOverride);
-
-        if (HttpMethod.PATCH.toString().equalsIgnoreCase(xHttpHeaderOverride)) {
-            if (cacheServiceProvider.patchPnf(pnfId, pnf)) {
-                return ResponseEntity.accepted().build();
-            }
-            LOGGER.error("Unable to apply patch to Pnf using 'pnf-id': {} ... ", pnfId);
-            return getRequestErrorResponseEntity(request, PNF);
-        }
-        LOGGER.error("{} not supported ... ", xHttpHeaderOverride);
-
-        return getRequestErrorResponseEntity(request, PNF);
-    }
-
-    @GetMapping(produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getPnfs(@RequestParam(name = "selflink") final String selflink,
-                                     final HttpServletRequest request) {
-        LOGGER.info("will retrieve Pnfs using selflink: {}", selflink);
-
-        final List<Pnf> pnfList = cacheServiceProvider.getPnfs(selflink);
-
-        if (pnfList.isEmpty()) {
-            LOGGER.error("No matching pnfs found using selflink: {}", selflink);
-            return getRequestErrorResponseEntity(request, PNF);
-        }
-
-        LOGGER.info("found {} Pnfs in cache", pnfList.size());
-        final Pnfs pnfs = new Pnfs();
-        pnfs.getPnf().addAll(pnfList);
-        return ResponseEntity.ok(pnfs);
-    }
-
-    @DeleteMapping(value = "/pnf/{pnf-id}", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> deletePnf(@PathVariable("pnf-id") final String pnfId,
-                                       @RequestParam(name = "resource-version") final String resourceVersion, final HttpServletRequest request) {
-        LOGGER.info("Will delete Pnf for 'pnf-id': {} and 'resource-version': {}", pnfId, resourceVersion);
-
-        if (cacheServiceProvider.deletePnf(pnfId, resourceVersion)) {
-            LOGGER.info("Successfully delete Pnf from cache for 'pnf-id': {} and 'resource-version': {}", pnfId,
-                    resourceVersion);
-            return ResponseEntity.noContent().build();
-        }
-
-        LOGGER.error("Unable to delete Pnf for 'pnf-id': {} and 'resource-version': {} ...", pnfId,
-                resourceVersion);
-        return getRequestErrorResponseEntity(request, PNF);
-
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ProjectController.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ProjectController.java
deleted file mode 100755
index 490982a5..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ProjectController.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.onap.so.aaisimulator.utils.Constants.PROJECT;
-import static org.onap.so.aaisimulator.utils.Constants.PROJECT_URL;
-import static org.onap.so.aaisimulator.utils.Constants.RELATIONSHIP_LIST_RELATIONSHIP_URL;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getHeaders;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getRequestErrorResponseEntity;
-import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getResourceVersion;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MediaType;
-import org.onap.aai.domain.yang.Project;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.so.aaisimulator.models.Format;
-import org.onap.so.aaisimulator.models.Results;
-import org.onap.so.aaisimulator.service.providers.ProjectCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.HttpServiceUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@Controller
-@RequestMapping(path = PROJECT_URL)
-public class ProjectController {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ProjectController.class);
-
-    private final ProjectCacheServiceProvider cacheServiceProvider;
-
-    @Autowired
-    public ProjectController(final ProjectCacheServiceProvider cacheServiceProvider) {
-        this.cacheServiceProvider = cacheServiceProvider;
-    }
-
-    @PutMapping(value = "/{project-name}", consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putProject(@RequestBody final Project project,
-            @PathVariable("project-name") final String projectName, final HttpServletRequest request) {
-        LOGGER.info("Will put project for 'project-name': {} ...", project.getProjectName());
-
-        if (project.getResourceVersion() == null || project.getResourceVersion().isEmpty()) {
-            project.setResourceVersion(getResourceVersion());
-
-        }
-        cacheServiceProvider.putProject(projectName, project);
-        return ResponseEntity.accepted().build();
-
-    }
-
-    @GetMapping(value = "/{project-name}", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getProject(@PathVariable("project-name") final String projectName,
-            @RequestParam(name = "resultIndex", required = false) final Integer resultIndex,
-            @RequestParam(name = "resultSize", required = false) final Integer resultSize,
-            @RequestParam(name = "format", required = false) final String format, final HttpServletRequest request) {
-        LOGGER.info("retrieving project for 'project-name': {} ...", projectName);
-
-        final Optional<Project> optional = cacheServiceProvider.getProject(projectName);
-        if (!optional.isPresent()) {
-            LOGGER.error("Couldn't find {} in cache", projectName);
-            return getRequestErrorResponseEntity(request);
-        }
-
-        final Format value = Format.forValue(format);
-        switch (value) {
-            case RAW:
-                final Project project = optional.get();
-                LOGGER.info("found project {} in cache", project);
-                return ResponseEntity.ok(project);
-            case COUNT:
-                final Map<String, Object> map = new HashMap<>();
-                map.put(PROJECT, 1);
-                return ResponseEntity.ok(new Results(map));
-            default:
-                break;
-        }
-        LOGGER.error("invalid format type :{}", format);
-        return getRequestErrorResponseEntity(request);
-    }
-
-    @PutMapping(value = "/{project-name}" + RELATIONSHIP_LIST_RELATIONSHIP_URL,
-            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> putProjectRelationShip(@RequestBody final Relationship relationship,
-            @PathVariable("project-name") final String projectName, final HttpServletRequest request) {
-
-        LOGGER.info("adding relationship for project-name: {} ...", projectName);
-
-        if (relationship.getRelatedLink() != null) {
-            final String targetBaseUrl = HttpServiceUtils.getBaseUrl(request).toString();
-            final HttpHeaders incomingHeader = getHeaders(request);
-
-            final boolean result = cacheServiceProvider.addRelationShip(incomingHeader, targetBaseUrl,
-                    request.getRequestURI(), projectName, relationship);
-            if (result) {
-                LOGGER.info("added created bi directional relationship with {}", relationship.getRelatedLink());
-                return ResponseEntity.accepted().build();
-            }
-        }
-
-        LOGGER.error("Unable to add relationship for related link: {}", relationship.getRelatedLink());
-        return getRequestErrorResponseEntity(request);
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/InvalidRestRequestException.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/InvalidRestRequestException.java
deleted file mode 100755
index 4a7c289c..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/InvalidRestRequestException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.aaisimulator.exception;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public class InvalidRestRequestException extends RuntimeException {
-    private static final long serialVersionUID = -1158414939006977465L;
-
-    public InvalidRestRequestException(final String message) {
-        super(message);
-    }
-
-    public InvalidRestRequestException(final String message, final Throwable cause) {
-        super(message, cause);
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/RestProcessingException.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/RestProcessingException.java
deleted file mode 100755
index 0a93e2f2..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/RestProcessingException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.exception;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public class RestProcessingException extends RuntimeException {
-
-    private static final long serialVersionUID = 16862313537198441L;
-
-    public RestProcessingException(final String message) {
-        super(message);
-    }
-
-    public RestProcessingException(final String message, final Throwable cause) {
-        super(message, cause);
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/CloudRegionKey.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/CloudRegionKey.java
deleted file mode 100755
index 3c45c196..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/CloudRegionKey.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.models;
-
-import java.io.Serializable;
-import org.springframework.util.ObjectUtils;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public class CloudRegionKey implements Serializable {
-
-    private static final long serialVersionUID = 6175094050996035737L;
-
-    private final String cloudOwner;
-
-    private final String cloudRegionId;
-
-    public CloudRegionKey(final String cloudOwner, final String cloudRegionId) {
-        this.cloudOwner = cloudOwner;
-        this.cloudRegionId = cloudRegionId;
-    }
-
-    /**
-     * @return the cloudOwner
-     */
-    public String getCloudOwner() {
-        return cloudOwner;
-    }
-
-    /**
-     * @return the cloudRegionId
-     */
-    public String getCloudRegionId() {
-        return cloudRegionId;
-    }
-
-    public boolean isValid() {
-        return cloudOwner != null && !cloudOwner.isEmpty() && cloudRegionId != null && !cloudRegionId.isEmpty();
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (ObjectUtils.nullSafeHashCode(cloudOwner));
-        result = prime * result + (ObjectUtils.nullSafeHashCode(cloudRegionId));
-
-        return result;
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        if (obj instanceof CloudRegionKey) {
-            final CloudRegionKey other = (CloudRegionKey) obj;
-            return ObjectUtils.nullSafeEquals(cloudOwner, other.cloudOwner)
-                    && ObjectUtils.nullSafeEquals(cloudRegionId, other.cloudRegionId);
-        }
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        return "CloudRegionKey [cloudOwner=" + cloudOwner + ", cloudRegionId=" + cloudRegionId + "]";
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Format.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Format.java
deleted file mode 100755
index 1c851fc3..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Format.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.models;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public enum Format {
-
-    COUNT("count"), RAW("raw"), PATHED("pathed");
-
-    private final String value;
-
-    private Format(final String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public static Format forValue(final String value) {
-        for (final Format format : Format.values()) {
-            if (format.getValue().equals(value)) {
-                return format;
-            }
-        }
-        return RAW;
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/NodeServiceInstance.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/NodeServiceInstance.java
deleted file mode 100755
index 4a645915..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/NodeServiceInstance.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.models;
-
-import java.io.Serializable;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public class NodeServiceInstance implements Serializable {
-
-    private static final long serialVersionUID = -3314166327618070948L;
-
-    private String globalCustomerId;
-    private String serviceType;
-    private String serviceInstanceId;
-    private String resourceType;
-    private String resourceLink;
-
-    public NodeServiceInstance() {}
-
-
-    public NodeServiceInstance(final String globalCustomerId, final String serviceType, final String serviceInstanceId,
-            final String resourceType, final String resourceLink) {
-        this.globalCustomerId = globalCustomerId;
-        this.serviceType = serviceType;
-        this.serviceInstanceId = serviceInstanceId;
-        this.resourceType = resourceType;
-        this.resourceLink = resourceLink;
-    }
-
-
-    /**
-     * @return the globalCustomerId
-     */
-    public String getGlobalCustomerId() {
-        return globalCustomerId;
-    }
-
-
-    /**
-     * @param globalCustomerId the globalCustomerId to set
-     */
-    public void setGlobalCustomerId(final String globalCustomerId) {
-        this.globalCustomerId = globalCustomerId;
-    }
-
-
-    /**
-     * @return the serviceType
-     */
-    public String getServiceType() {
-        return serviceType;
-    }
-
-
-    /**
-     * @param serviceType the serviceType to set
-     */
-    public void setServiceType(final String serviceType) {
-        this.serviceType = serviceType;
-    }
-
-
-    /**
-     * @return the serviceInstanceId
-     */
-    public String getServiceInstanceId() {
-        return serviceInstanceId;
-    }
-
-
-    /**
-     * @param serviceInstanceId the serviceInstanceId to set
-     */
-    public void setServiceInstanceId(final String serviceInstanceId) {
-        this.serviceInstanceId = serviceInstanceId;
-    }
-
-
-    /**
-     * @return the resourceType
-     */
-    public String getResourceType() {
-        return resourceType;
-    }
-
-
-    /**
-     * @param resourceType the resourceType to set
-     */
-    public void setResourceType(final String resourceType) {
-        this.resourceType = resourceType;
-    }
-
-
-    /**
-     * @return the resourceLink
-     */
-    public String getResourceLink() {
-        return resourceLink;
-    }
-
-
-    /**
-     * @param resourceLink the resourceLink to set
-     */
-    public void setResourceLink(final String resourceLink) {
-        this.resourceLink = resourceLink;
-    }
-
-
-    @Override
-    public String toString() {
-        return "NodeServiceInstance [globalCustomerId=" + globalCustomerId + ", serviceType=" + serviceType
-                + ", serviceInstanceId=" + serviceInstanceId + ", resourceType=" + resourceType + ", resourceLink="
-                + resourceLink + "]";
-    }
-
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Results.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Results.java
deleted file mode 100755
index 8dc20242..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Results.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.models;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public class Results implements Serializable {
-
-    private static final long serialVersionUID = 3967660859271162759L;
-
-    @JsonProperty("results")
-    private List<Map<String, Object>> values = new ArrayList<>();
-
-    public Results() {}
-
-    public Results(final Map<String, Object> value) {
-        this.values.add(value);
-    }
-
-    /**
-     * @return the values
-     */
-    public List<Map<String, Object>> getValues() {
-        return values;
-    }
-
-    /**
-     * @param values the values to set
-     */
-    public void setValues(final List<Map<String, Object>> values) {
-        this.values = values;
-    }
-
-
-    @JsonIgnore
-    @Override
-    public String toString() {
-        return "Result [values=" + values + "]";
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/Clearable.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/Clearable.java
deleted file mode 100755
index dd4ace4d..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/Clearable.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public interface Clearable {
-    void clearAll();
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProvider.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProvider.java
deleted file mode 100755
index 6facac82..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProvider.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import java.util.Optional;
-import org.onap.aai.domain.yang.CloudRegion;
-import org.onap.aai.domain.yang.EsrSystemInfo;
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.Tenant;
-import org.onap.aai.domain.yang.Vserver;
-import org.onap.so.aaisimulator.models.CloudRegionKey;
-import org.springframework.http.HttpHeaders;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public interface CloudRegionCacheServiceProvider extends Clearable {
-
-    void putCloudRegion(final CloudRegionKey cloudRegionKey, final CloudRegion cloudRegion);
-
-    Optional<CloudRegion> getCloudRegion(final CloudRegionKey cloudRegionKey);
-
-    Optional<Relationship> addRelationShip(final CloudRegionKey key, final Relationship relationship,
-            final String requestUri);
-
-    boolean putTenant(final CloudRegionKey key, final String tenantId, Tenant tenant);
-
-    Optional<Tenant> getTenant(final CloudRegionKey key, final String tenantId);
-
-    boolean addRelationShip(final HttpHeaders incomingHeader, final String targetBaseUrl, final String requestURI,
-            final CloudRegionKey key, final String tenantId, final Relationship relationship);
-
-    Optional<EsrSystemInfoList> getEsrSystemInfoList(final CloudRegionKey key);
-
-    boolean putEsrSystemInfo(final CloudRegionKey key, final String esrSystemInfoId, final EsrSystemInfo esrSystemInfo);
-
-    boolean putVserver(final CloudRegionKey key, final String tenantId, final String vServerId, Vserver vServer);
-
-    Optional<Vserver> getVserver(final CloudRegionKey key, final String tenantId, final String vServerId);
-
-    boolean deleteVserver(final CloudRegionKey key, final String tenantId, final String vServerId,
-            final String resourceVersion);
-
-    Optional<Relationship> addvServerRelationShip(final CloudRegionKey key, final String tenantId,
-            final String vServerId, final Relationship relationship, final String requestUri);
-
-    boolean addVServerRelationShip(final HttpHeaders incomingHeader, final String targetBaseUrl, final String requestURI, final CloudRegionKey key,
-            final String tenantId, final String vServerId, final Relationship relationship);
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProviderImpl.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProviderImpl.java
deleted file mode 100755
index f1f782a0..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProviderImpl.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import static org.onap.so.aaisimulator.utils.CacheName.CLOUD_REGION_CACHE;
-import static org.onap.so.aaisimulator.utils.Constants.BELONGS_TO;
-import static org.onap.so.aaisimulator.utils.Constants.CLOUD_REGION;
-import static org.onap.so.aaisimulator.utils.Constants.CLOUD_REGION_CLOUD_OWNER;
-import static org.onap.so.aaisimulator.utils.Constants.CLOUD_REGION_CLOUD_REGION_ID;
-import static org.onap.so.aaisimulator.utils.Constants.CLOUD_REGION_OWNER_DEFINED_TYPE;
-import static org.onap.so.aaisimulator.utils.Constants.HOSTED_ON;
-import static org.onap.so.aaisimulator.utils.Constants.LOCATED_IN;
-import static org.onap.so.aaisimulator.utils.Constants.TENANT;
-import static org.onap.so.aaisimulator.utils.Constants.TENANT_TENANT_ID;
-import static org.onap.so.aaisimulator.utils.Constants.TENANT_TENANT_NAME;
-import static org.onap.so.aaisimulator.utils.Constants.VSERVER;
-import static org.onap.so.aaisimulator.utils.Constants.VSERVER_VSERVER_ID;
-import static org.onap.so.aaisimulator.utils.Constants.VSERVER_VSERVER_NAME;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getBiDirectionalRelationShipListRelatedLink;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getRelationShipListRelatedLink;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getTargetUrl;
-import java.util.List;
-import java.util.Optional;
-import org.onap.aai.domain.yang.CloudRegion;
-import org.onap.aai.domain.yang.EsrSystemInfo;
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.aai.domain.yang.RelatedToProperty;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.RelationshipList;
-import org.onap.aai.domain.yang.Tenant;
-import org.onap.aai.domain.yang.Tenants;
-import org.onap.aai.domain.yang.Vserver;
-import org.onap.aai.domain.yang.Vservers;
-import org.onap.so.aaisimulator.models.CloudRegionKey;
-import org.onap.so.simulator.cache.provider.AbstractCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.http.HttpHeaders;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@Service
-public class CloudRegionCacheServiceProviderImpl extends AbstractCacheServiceProvider
-        implements CloudRegionCacheServiceProvider {
-
-
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CloudRegionCacheServiceProviderImpl.class);
-
-    private final HttpRestServiceProvider httpRestServiceProvider;
-
-    @Autowired
-    public CloudRegionCacheServiceProviderImpl(final CacheManager cacheManager,
-            final HttpRestServiceProvider httpRestServiceProvider) {
-        super(cacheManager);
-        this.httpRestServiceProvider = httpRestServiceProvider;
-    }
-
-    @Override
-    public void putCloudRegion(final CloudRegionKey cloudRegionKey, final CloudRegion cloudRegion) {
-        LOGGER.info("Adding CloudRegion to cache with key: {} ...", cloudRegionKey);
-        final Cache cache = getCache(CLOUD_REGION_CACHE.getName());
-        cache.put(cloudRegionKey, cloudRegion);
-
-    }
-
-    @Override
-    public Optional<CloudRegion> getCloudRegion(final CloudRegionKey cloudRegionKey) {
-        LOGGER.info("getting CloudRegion from cache using key: {}", cloudRegionKey);
-        final Cache cache = getCache(CLOUD_REGION_CACHE.getName());
-        final CloudRegion value = cache.get(cloudRegionKey, CloudRegion.class);
-        if (value != null) {
-            return Optional.of(value);
-        }
-        LOGGER.error("Unable to find CloudRegion in cache using key:{} ", cloudRegionKey);
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<Relationship> addRelationShip(final CloudRegionKey key, final Relationship relationship,
-            final String requestUri) {
-        final Optional<CloudRegion> optional = getCloudRegion(key);
-        if (optional.isPresent()) {
-            final CloudRegion cloudRegion = optional.get();
-            RelationshipList relationshipList = cloudRegion.getRelationshipList();
-            if (relationshipList == null) {
-                relationshipList = new RelationshipList();
-                cloudRegion.setRelationshipList(relationshipList);
-            }
-            relationshipList.getRelationship().add(relationship);
-
-            LOGGER.info("Successfully added relation to CloudRegion with key: {}", key);
-
-
-            final Relationship resultantRelationship = new Relationship();
-            resultantRelationship.setRelatedTo(CLOUD_REGION);
-            resultantRelationship.setRelationshipLabel(LOCATED_IN);
-            resultantRelationship.setRelatedLink(getBiDirectionalRelationShipListRelatedLink(requestUri));
-
-            final List<RelationshipData> relationshipDataList = resultantRelationship.getRelationshipData();
-            relationshipDataList.add(getRelationshipData(CLOUD_REGION_CLOUD_OWNER, cloudRegion.getCloudOwner()));
-            relationshipDataList.add(getRelationshipData(CLOUD_REGION_CLOUD_REGION_ID, cloudRegion.getCloudRegionId()));
-
-            final List<RelatedToProperty> relatedToPropertyList = resultantRelationship.getRelatedToProperty();
-
-            final RelatedToProperty relatedToProperty = new RelatedToProperty();
-            relatedToProperty.setPropertyKey(CLOUD_REGION_OWNER_DEFINED_TYPE);
-            relatedToProperty.setPropertyValue(cloudRegion.getOwnerDefinedType());
-            relatedToPropertyList.add(relatedToProperty);
-
-            return Optional.of(resultantRelationship);
-
-        }
-        LOGGER.error("Unable to find CloudRegion using key: {} ...", key);
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean putTenant(final CloudRegionKey key, final String tenantId, final Tenant tenant) {
-        final Optional<CloudRegion> optional = getCloudRegion(key);
-        if (optional.isPresent()) {
-            final CloudRegion cloudRegion = optional.get();
-            Tenants tenants = cloudRegion.getTenants();
-            if (tenants == null) {
-                tenants = new Tenants();
-                cloudRegion.setTenants(tenants);
-            }
-
-            final Optional<Tenant> existingTenantOptional = tenants.getTenant().stream()
-                    .filter(existing -> existing.getTenantId() != null && existing.getTenantId().equals(tenantId))
-                    .findFirst();
-
-            if (!existingTenantOptional.isPresent()) {
-                return tenants.getTenant().add(tenant);
-            }
-
-            LOGGER.warn("Tenant already exists ...");
-            return false;
-        }
-        LOGGER.error("Unable to add Tenant using key: {} ...", key);
-        return false;
-    }
-
-    @Override
-    public Optional<Tenant> getTenant(final CloudRegionKey key, final String tenantId) {
-        final Optional<CloudRegion> optional = getCloudRegion(key);
-        if (optional.isPresent()) {
-            final CloudRegion cloudRegion = optional.get();
-            final Tenants tenants = cloudRegion.getTenants();
-            if (tenants != null) {
-                return tenants.getTenant().stream().filter(existing -> existing.getTenantId().equals(tenantId))
-                        .findFirst();
-            }
-        }
-
-        LOGGER.error("Unable to find Tenant using key: {} and tenantId: {} ...", key, tenantId);
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean addRelationShip(final HttpHeaders incomingHeader, final String targetBaseUrl,
-            final String requestUriString, final CloudRegionKey key, final String tenantId,
-            final Relationship relationship) {
-        try {
-            final Optional<Tenant> optional = getTenant(key, tenantId);
-            if (optional.isPresent()) {
-                final Tenant tenant = optional.get();
-                final String targetUrl = getTargetUrl(targetBaseUrl, relationship.getRelatedLink());
-
-                final Relationship outGoingRelationShip = getRelationship(requestUriString, key, tenant);
-                final Optional<Relationship> optionalRelationship = httpRestServiceProvider.put(incomingHeader,
-                        outGoingRelationShip, targetUrl, Relationship.class);
-
-                if (optionalRelationship.isPresent()) {
-                    final Relationship resultantRelationship = optionalRelationship.get();
-                    RelationshipList relationshipList = tenant.getRelationshipList();
-                    if (relationshipList == null) {
-                        relationshipList = new RelationshipList();
-                        tenant.setRelationshipList(relationshipList);
-                    }
-
-                    if (relationshipList.getRelationship().add(resultantRelationship)) {
-                        LOGGER.info("added relationship {} in cache successfully", resultantRelationship);
-                        return true;
-                    }
-                }
-
-
-            }
-        } catch (final Exception exception) {
-            LOGGER.error("Unable to add two-way relationship for CloudRegion: {} and tenant: {}", key, tenantId,
-                    exception);
-        }
-        LOGGER.error("Unable to add relationship in cache for CloudRegion: {} and tenant: {}", key, tenantId);
-        return false;
-    }
-
-    @Override
-    public Optional<EsrSystemInfoList> getEsrSystemInfoList(final CloudRegionKey key) {
-        final Optional<CloudRegion> optional = getCloudRegion(key);
-        if (optional.isPresent()) {
-            final CloudRegion cloudRegion = optional.get();
-            final EsrSystemInfoList esrSystemInfoList = cloudRegion.getEsrSystemInfoList();
-            if (esrSystemInfoList != null) {
-                return Optional.of(esrSystemInfoList);
-            }
-        }
-        LOGGER.error("Unable to find EsrSystemInfoList in cache for CloudRegion: {} ", key);
-
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean putEsrSystemInfo(final CloudRegionKey key, final String esrSystemInfoId,
-            final EsrSystemInfo esrSystemInfo) {
-        final Optional<CloudRegion> optional = getCloudRegion(key);
-        if (optional.isPresent()) {
-            final CloudRegion cloudRegion = optional.get();
-            final List<EsrSystemInfo> esrSystemInfoList = getEsrSystemInfoList(cloudRegion);
-
-            final Optional<EsrSystemInfo> existingEsrSystemInfo =
-                    esrSystemInfoList.stream().filter(existing -> existing.getEsrSystemInfoId() != null
-                            && existing.getEsrSystemInfoId().equals(esrSystemInfoId)).findFirst();
-            if (existingEsrSystemInfo.isPresent()) {
-                LOGGER.error("EsrSystemInfo already exists {}", existingEsrSystemInfo.get());
-                return false;
-            }
-
-            return esrSystemInfoList.add(esrSystemInfo);
-
-        }
-        return false;
-    }
-
-    @Override
-    public boolean putVserver(final CloudRegionKey key, final String tenantId, final String vServerId,
-            final Vserver vServer) {
-        final Optional<Tenant> optional = getTenant(key, tenantId);
-        if (optional.isPresent()) {
-            final Tenant tenant = optional.get();
-            Vservers vServers = tenant.getVservers();
-            if (vServers == null) {
-                vServers = new Vservers();
-                tenant.setVservers(vServers);
-            }
-            final List<Vserver> vServerList = vServers.getVserver();
-
-            final Optional<Vserver> existingVserver = vServerList.stream()
-                    .filter(existing -> existing.getVserverId() != null && existing.getVserverId().equals(vServerId))
-                    .findFirst();
-
-            if (existingVserver.isPresent()) {
-                LOGGER.error("Vserver already exists {}", existingVserver.get());
-                return false;
-            }
-            return vServerList.add(vServer);
-
-        }
-        return false;
-    }
-
-    @Override
-    public Optional<Vserver> getVserver(final CloudRegionKey key, final String tenantId, final String vServerId) {
-        final Optional<Tenant> optional = getTenant(key, tenantId);
-        if (optional.isPresent()) {
-            final Tenant tenant = optional.get();
-            final Vservers vServers = tenant.getVservers();
-            if (vServers != null) {
-                return vServers.getVserver().stream()
-                        .filter(vServer -> vServer.getVserverId() != null && vServer.getVserverId().equals(vServerId))
-                        .findFirst();
-            }
-        }
-        LOGGER.error("Unable to find vServer in cache ... ");
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean deleteVserver(final CloudRegionKey key, final String tenantId, final String vServerId,
-            final String resourceVersion) {
-        final Optional<Vserver> optional = getVserver(key, tenantId, vServerId);
-        if (optional.isPresent()) {
-            final Optional<Tenant> tenantOptional = getTenant(key, tenantId);
-            if (tenantOptional.isPresent()) {
-                final Tenant tenant = tenantOptional.get();
-                final Vservers vServers = tenant.getVservers();
-                if (vServers != null) {
-                    return vServers.getVserver().removeIf(vServer -> {
-                        if (vServer.getVserverId() != null && vServer.getVserverId().equals(vServerId)
-                                && vServer.getResourceVersion() != null
-                                && vServer.getResourceVersion().equals(resourceVersion)) {
-                            LOGGER.info("Will remove Vserver from cache with vServerId: {} and resource-version: {} ",
-                                    vServerId, vServer.getResourceVersion());
-                            return true;
-                        }
-                        return false;
-                    });
-                }
-
-            }
-
-        }
-        LOGGER.error(
-                "Unable to find Vserver for using key: {}, tenant-id: {}, vserver-id: {} and resource-version: {} ...",
-                key, tenantId, vServerId, resourceVersion);
-
-        return false;
-    }
-
-    @Override
-    public Optional<Relationship> addvServerRelationShip(final CloudRegionKey key, final String tenantId,
-            final String vServerId, final Relationship relationship, final String requestUri) {
-        final Optional<Vserver> optional = getVserver(key, tenantId, vServerId);
-        if (optional.isPresent()) {
-            final Vserver vServer = optional.get();
-            RelationshipList relationshipList = vServer.getRelationshipList();
-            if (relationshipList == null) {
-                relationshipList = new RelationshipList();
-                vServer.setRelationshipList(relationshipList);
-            }
-            relationshipList.getRelationship().add(relationship);
-            LOGGER.info("Successfully added relation to Vserver with key: {}, tenantId: {} and vServerId: {}", key,
-                    tenantId, vServerId);
-            final String relatedLink = getBiDirectionalRelationShipListRelatedLink(requestUri);
-
-            final Relationship resultantRelationship = getVserverRelationship(key, tenantId, vServer, relatedLink);
-
-            return Optional.of(resultantRelationship);
-        }
-
-        LOGGER.error("Unable to find Vserver using key: {}, tenantId: {} and vServerId: {}...", key, tenantId,
-                vServerId);
-        return Optional.empty();
-    }
-
-    private Relationship getVserverRelationship(final CloudRegionKey key, final String tenantId, final Vserver vServer,
-            final String relatedLink) {
-        final Relationship resultantRelationship = new Relationship();
-        resultantRelationship.setRelatedTo(VSERVER);
-        resultantRelationship.setRelationshipLabel(HOSTED_ON);
-        resultantRelationship.setRelatedLink(relatedLink);
-
-        final List<RelationshipData> relationshipDataList = resultantRelationship.getRelationshipData();
-        relationshipDataList.add(getRelationshipData(CLOUD_REGION_CLOUD_OWNER, key.getCloudOwner()));
-        relationshipDataList.add(getRelationshipData(CLOUD_REGION_CLOUD_REGION_ID, key.getCloudRegionId()));
-        relationshipDataList.add(getRelationshipData(TENANT_TENANT_ID, tenantId));
-        relationshipDataList.add(getRelationshipData(VSERVER_VSERVER_ID, vServer.getVserverId()));
-
-        final List<RelatedToProperty> relatedToPropertyList = resultantRelationship.getRelatedToProperty();
-
-        final RelatedToProperty relatedToProperty = new RelatedToProperty();
-        relatedToProperty.setPropertyKey(VSERVER_VSERVER_NAME);
-        relatedToProperty.setPropertyValue(vServer.getVserverName());
-        relatedToPropertyList.add(relatedToProperty);
-        return resultantRelationship;
-    }
-
-    @Override
-    public boolean addVServerRelationShip(final HttpHeaders incomingHeader, final String targetBaseUrl,
-            final String requestUriString, final CloudRegionKey key, final String tenantId, final String vServerId,
-            final Relationship relationship) {
-        try {
-            final Optional<Vserver> optional = getVserver(key, tenantId, vServerId);
-            if (optional.isPresent()) {
-                final Vserver vServer = optional.get();
-                final String targetUrl = getTargetUrl(targetBaseUrl, relationship.getRelatedLink());
-                final Relationship outGoingRelationShip = getVserverRelationship(key, tenantId, vServer,
-                        getRelationShipListRelatedLink(requestUriString));
-                final Optional<Relationship> optionalRelationship = httpRestServiceProvider.put(incomingHeader,
-                        outGoingRelationShip, targetUrl, Relationship.class);
-                if (optionalRelationship.isPresent()) {
-                    final Relationship resultantRelationship = optionalRelationship.get();
-
-                    RelationshipList relationshipList = vServer.getRelationshipList();
-                    if (relationshipList == null) {
-                        relationshipList = new RelationshipList();
-                        vServer.setRelationshipList(relationshipList);
-                    }
-
-                    final Optional<Relationship> relationShipExists = relationshipList.getRelationship().stream()
-                            .filter(relation -> relation.getRelatedTo().equals(resultantRelationship.getRelatedTo())
-                                    && relation.getRelatedLink().equals(resultantRelationship.getRelatedLink()))
-                            .findAny();
-
-                    if (relationShipExists.isPresent()) {
-                        LOGGER.info("relationship {} already exists in cache ", resultantRelationship);
-                        return true;
-                    }
-
-                    LOGGER.info("added relationship {} in cache successfully", resultantRelationship);
-                    return relationshipList.getRelationship().add(resultantRelationship);
-                }
-
-            }
-        } catch (final Exception exception) {
-            LOGGER.error("Unable to add two-way relationship for key: {}, tenantId: {} and vServerId: {}", key,
-                    tenantId, vServerId, exception);
-        }
-        LOGGER.error("Unable to add Vserver relationship for key: {}, tenantId: {} and vServerId: {}...", key, tenantId,
-                vServerId);
-        return false;
-    }
-
-    private List<EsrSystemInfo> getEsrSystemInfoList(final CloudRegion cloudRegion) {
-        EsrSystemInfoList esrSystemInfoList = cloudRegion.getEsrSystemInfoList();
-        if (esrSystemInfoList == null) {
-            esrSystemInfoList = new EsrSystemInfoList();
-            cloudRegion.setEsrSystemInfoList(esrSystemInfoList);
-        }
-        return esrSystemInfoList.getEsrSystemInfo();
-    }
-
-    private Relationship getRelationship(final String requestUriString, final CloudRegionKey cloudRegionKey,
-            final Tenant tenant) {
-        final Relationship relationShip = new Relationship();
-        relationShip.setRelatedTo(TENANT);
-        relationShip.setRelationshipLabel(BELONGS_TO);
-        relationShip.setRelatedLink(getRelationShipListRelatedLink(requestUriString));
-
-
-        final List<RelationshipData> relationshipDataList = relationShip.getRelationshipData();
-        relationshipDataList.add(getRelationshipData(CLOUD_REGION_CLOUD_OWNER, cloudRegionKey.getCloudOwner()));
-        relationshipDataList.add(getRelationshipData(CLOUD_REGION_CLOUD_REGION_ID, cloudRegionKey.getCloudRegionId()));
-        relationshipDataList.add(getRelationshipData(TENANT_TENANT_ID, tenant.getTenantId()));
-
-
-        final RelatedToProperty relatedToProperty = new RelatedToProperty();
-        relatedToProperty.setPropertyKey(TENANT_TENANT_NAME);
-        relatedToProperty.setPropertyValue(tenant.getTenantName());
-        relationShip.getRelatedToProperty().add(relatedToProperty);
-        return relationShip;
-    }
-
-    private RelationshipData getRelationshipData(final String key, final String value) {
-        final RelationshipData relationshipData = new RelationshipData();
-        relationshipData.setRelationshipKey(key);
-        relationshipData.setRelationshipValue(value);
-        return relationshipData;
-    }
-
-    @Override
-    public void clearAll() {
-        clearCache(CLOUD_REGION_CACHE.getName());
-
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProvider.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProvider.java
deleted file mode 100755
index 7000fb3f..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProvider.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import java.util.Optional;
-import org.onap.aai.domain.yang.Customer;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.ServiceInstance;
-import org.onap.aai.domain.yang.ServiceInstances;
-import org.onap.aai.domain.yang.ServiceSubscription;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public interface CustomerCacheServiceProvider extends Clearable {
-
-    Optional<Customer> getCustomer(final String globalCustomerId);
-
-    void putCustomer(final String globalCustomerId, final Customer customer);
-
-    Optional<ServiceSubscription> getServiceSubscription(final String globalCustomerId, final String serviceType);
-
-    boolean putServiceSubscription(final String globalCustomerId, final String serviceType,
-            final ServiceSubscription serviceSubscription);
-
-    Optional<ServiceInstances> getServiceInstances(final String globalCustomerId, final String serviceType,
-            final String serviceInstanceName);
-
-    Optional<ServiceInstance> getServiceInstance(final String globalCustomerId, final String serviceType,
-            final String serviceInstanceId);
-
-    boolean putServiceInstance(final String globalCustomerId, final String serviceType, final String serviceInstanceId,
-            final ServiceInstance serviceInstance);
-
-    boolean patchServiceInstance(final String globalCustomerId, final String serviceType,
-            final String serviceInstanceId, final ServiceInstance serviceInstance);
-
-    Optional<Relationship> getRelationship(final String globalCustomerId, final String serviceType,
-            final String serviceInstanceId, final String vnfName);
-
-    Optional<Relationship> addRelationShip(final String globalCustomerId, final String serviceType,
-            final String serviceInstanceId, final Relationship relationship, final String requestUri);
-
-    boolean deleteSericeInstance(final String globalCustomerId, final String serviceType,
-            final String serviceInstanceId, final String resourceVersion);
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProviderImpl.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProviderImpl.java
deleted file mode 100755
index 7193ade1..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProviderImpl.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import static org.onap.so.aaisimulator.utils.CacheName.CUSTOMER_CACHE;
-import static org.onap.so.aaisimulator.utils.Constants.CUSTOMER_GLOBAL_CUSTOMER_ID;
-import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF;
-import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF_VNF_NAME;
-import static org.onap.so.aaisimulator.utils.Constants.SERVICE_INSTANCE_SERVICE_INSTANCE_ID;
-import static org.onap.so.aaisimulator.utils.Constants.SERVICE_INSTANCE_SERVICE_INSTANCE_NAME;
-import static org.onap.so.aaisimulator.utils.Constants.SERVICE_SUBSCRIPTION_SERVICE_TYPE;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getBiDirectionalRelationShipListRelatedLink;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import org.onap.aai.domain.yang.Customer;
-import org.onap.aai.domain.yang.RelatedToProperty;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.RelationshipList;
-import org.onap.aai.domain.yang.ServiceInstance;
-import org.onap.aai.domain.yang.ServiceInstances;
-import org.onap.aai.domain.yang.ServiceSubscription;
-import org.onap.aai.domain.yang.ServiceSubscriptions;
-import org.onap.so.simulator.cache.provider.AbstractCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.stereotype.Service;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@Service
-public class CustomerCacheServiceProviderImpl extends AbstractCacheServiceProvider
-        implements CustomerCacheServiceProvider {
-    private static final Logger LOGGER = LoggerFactory.getLogger(CustomerCacheServiceProviderImpl.class);
-
-    @Autowired
-    public CustomerCacheServiceProviderImpl(final CacheManager cacheManager) {
-        super(cacheManager);
-    }
-
-    @Override
-    public Optional<Customer> getCustomer(final String globalCustomerId) {
-        LOGGER.info("getting customer from cache using key: {}", globalCustomerId);
-        final Cache cache = getCache(CUSTOMER_CACHE.getName());
-        final Customer value = cache.get(globalCustomerId, Customer.class);
-        if (value != null) {
-            return Optional.of(value);
-        }
-        return Optional.empty();
-    }
-
-    @Override
-    public void putCustomer(final String globalCustomerId, final Customer customer) {
-        LOGGER.info("Adding customer: {} with key: {} in cache ...", customer, globalCustomerId);
-        final Cache cache = getCache(CUSTOMER_CACHE.getName());
-
-        cache.put(globalCustomerId, customer);
-    }
-
-    @Override
-    public Optional<ServiceSubscription> getServiceSubscription(final String globalCustomerId,
-            final String serviceType) {
-        LOGGER.info("getting service subscription from cache for globalCustomerId: {} and serviceType: {}",
-                globalCustomerId, serviceType);
-
-        final Cache cache = getCache(CUSTOMER_CACHE.getName());
-
-        final Customer value = cache.get(globalCustomerId, Customer.class);
-
-        if (value != null) {
-            return Optional.ofNullable(value.getServiceSubscriptions().getServiceSubscription().stream()
-                    .filter(s -> serviceType.equals(s.getServiceType())).findFirst().orElse(null));
-        }
-        return Optional.empty();
-
-    }
-
-    @Override
-    public Optional<ServiceInstances> getServiceInstances(final String globalCustomerId, final String serviceType,
-            final String serviceInstanceName) {
-
-        final Cache cache = getCache(CUSTOMER_CACHE.getName());
-        final Customer value = cache.get(globalCustomerId, Customer.class);
-
-        if (value != null) {
-            final Optional<ServiceSubscription> serviceSubscription = value.getServiceSubscriptions()
-                    .getServiceSubscription().stream().filter(s -> serviceType.equals(s.getServiceType())).findFirst();
-
-            if (serviceSubscription.isPresent()) {
-                LOGGER.info("Found service subscription ...");
-                final ServiceInstances serviceInstances = serviceSubscription.get().getServiceInstances();
-                if (serviceInstances != null) {
-                    final List<ServiceInstance> serviceInstancesList =
-                            serviceInstances.getServiceInstance().stream()
-                                    .filter(serviceInstance -> serviceInstanceName
-                                            .equals(serviceInstance.getServiceInstanceName()))
-                                    .collect(Collectors.toList());
-                    if (serviceInstancesList != null && !serviceInstancesList.isEmpty()) {
-                        LOGGER.info("Found {} service instances ", serviceInstancesList.size());
-                        final ServiceInstances result = new ServiceInstances();
-                        result.getServiceInstance().addAll(serviceInstancesList);
-                        return Optional.of(result);
-
-                    }
-                }
-            }
-        }
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<ServiceInstance> getServiceInstance(final String globalCustomerId, final String serviceType,
-            final String serviceInstanceId) {
-        final Cache cache = getCache(CUSTOMER_CACHE.getName());
-        final Customer value = cache.get(globalCustomerId, Customer.class);
-
-        if (value != null) {
-            final Optional<ServiceSubscription> serviceSubscription = value.getServiceSubscriptions()
-                    .getServiceSubscription().stream().filter(s -> serviceType.equals(s.getServiceType())).findFirst();
-
-            if (serviceSubscription.isPresent()) {
-                LOGGER.info("Found service subscription ...");
-                final ServiceInstances serviceInstances = serviceSubscription.get().getServiceInstances();
-                if (serviceInstances != null) {
-                    return Optional.ofNullable(serviceInstances.getServiceInstance().stream()
-                            .filter(serviceInstance -> serviceInstanceId.equals(serviceInstance.getServiceInstanceId()))
-                            .findFirst().orElse(null));
-                }
-
-            }
-        }
-        LOGGER.error(
-                "Unable to find ServiceInstance using globalCustomerId: {}, serviceType: {} and serviceInstanceId: {} ...",
-                globalCustomerId, serviceType, serviceInstanceId);
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean putServiceInstance(final String globalCustomerId, final String serviceType,
-            final String serviceInstanceId, final ServiceInstance serviceInstance) {
-        LOGGER.info("Adding serviceInstance: {} in cache ...", serviceInstance, globalCustomerId);
-
-        final Cache cache = getCache(CUSTOMER_CACHE.getName());
-        final Customer value = cache.get(globalCustomerId, Customer.class);
-
-        if (value != null) {
-            final Optional<ServiceSubscription> serviceSubscription = value.getServiceSubscriptions()
-                    .getServiceSubscription().stream().filter(s -> serviceType.equals(s.getServiceType())).findFirst();
-
-            if (serviceSubscription.isPresent()) {
-                final ServiceInstances serviceInstances = getServiceInstances(serviceSubscription);
-
-
-                if (!serviceInstances.getServiceInstance().stream()
-                        .filter(existing -> serviceInstanceId.equals(existing.getServiceInstanceId())).findFirst()
-                        .isPresent()) {
-                    return serviceInstances.getServiceInstance().add(serviceInstance);
-                }
-                LOGGER.error("Service {} already exists ....", serviceInstanceId);
-                return false;
-            }
-            LOGGER.error("Couldn't find  service subscription with serviceType: {} in cache ", serviceType);
-            return false;
-        }
-        LOGGER.error("Couldn't find  Customer with key: {} in cache ", globalCustomerId);
-        return false;
-    }
-
-    @Override
-    public boolean putServiceSubscription(final String globalCustomerId, final String serviceType,
-            final ServiceSubscription serviceSubscription) {
-
-        final Optional<Customer> customerOptional = getCustomer(globalCustomerId);
-
-        if (customerOptional.isPresent()) {
-            final Customer customer = customerOptional.get();
-            if (customer.getServiceSubscriptions() == null) {
-                final ServiceSubscriptions serviceSubscriptions = new ServiceSubscriptions();
-                customer.setServiceSubscriptions(serviceSubscriptions);
-                return serviceSubscriptions.getServiceSubscription().add(serviceSubscription);
-            }
-
-            final Optional<ServiceSubscription> serviceSubscriptionOptional = customer.getServiceSubscriptions()
-                    .getServiceSubscription().stream().filter(s -> serviceType.equals(s.getServiceType())).findFirst();
-
-            if (!serviceSubscriptionOptional.isPresent()) {
-                return customer.getServiceSubscriptions().getServiceSubscription().add(serviceSubscription);
-            }
-            LOGGER.error("ServiceSubscription already exists {}", serviceSubscriptionOptional.get().getServiceType());
-            return false;
-        }
-        LOGGER.error("Unable to add ServiceSubscription to cache becuase customer does not exits ...");
-        return false;
-    }
-
-    @Override
-    public boolean patchServiceInstance(final String globalCustomerId, final String serviceType,
-            final String serviceInstanceId, final ServiceInstance serviceInstance) {
-        final Optional<ServiceInstance> instance = getServiceInstance(globalCustomerId, serviceType, serviceInstanceId);
-        if (instance.isPresent()) {
-            final ServiceInstance cachedServiceInstance = instance.get();
-            LOGGER.info("Changing OrchestrationStatus from {} to {} ", cachedServiceInstance.getOrchestrationStatus(),
-                    serviceInstance.getOrchestrationStatus());
-            cachedServiceInstance.setOrchestrationStatus(serviceInstance.getOrchestrationStatus());
-            return true;
-        }
-        LOGGER.error("Unable to find ServiceInstance ...");
-        return false;
-    }
-
-    @Override
-    public boolean deleteSericeInstance(final String globalCustomerId, final String serviceType,
-            final String serviceInstanceId, final String resourceVersion) {
-        final Cache cache = getCache(CUSTOMER_CACHE.getName());
-        final Customer value = cache.get(globalCustomerId, Customer.class);
-
-        if (value != null) {
-            final Optional<ServiceSubscription> serviceSubscription = value.getServiceSubscriptions()
-                    .getServiceSubscription().stream().filter(s -> serviceType.equals(s.getServiceType())).findFirst();
-
-            if (serviceSubscription.isPresent()) {
-                LOGGER.info("Found service subscription ...");
-                final ServiceInstances serviceInstances = serviceSubscription.get().getServiceInstances();
-                if (serviceInstances != null) {
-
-                    serviceInstances.getServiceInstance().removeIf(serviceInstance -> {
-                        final String existingServiceInstanceId = serviceInstance.getServiceInstanceId();
-                        final String existingResourceVersion = serviceInstance.getResourceVersion();
-                        if (existingServiceInstanceId != null && existingServiceInstanceId.equals(serviceInstanceId)
-                                && existingResourceVersion != null && existingResourceVersion.equals(resourceVersion)) {
-                            LOGGER.info("Removing ServiceInstance with serviceInstanceId: {} and resourceVersion: {}",
-                                    existingServiceInstanceId, existingResourceVersion);
-                            return true;
-                        }
-                        return false;
-                    });
-
-
-                    return true;
-                }
-
-            }
-        }
-        return false;
-    }
-
-    private ServiceInstances getServiceInstances(final Optional<ServiceSubscription> optional) {
-        final ServiceSubscription serviceSubscription = optional.get();
-        final ServiceInstances serviceInstances = serviceSubscription.getServiceInstances();
-        if (serviceInstances == null) {
-            final ServiceInstances instances = new ServiceInstances();
-            serviceSubscription.setServiceInstances(instances);
-            return instances;
-        }
-        return serviceInstances;
-    }
-
-    @Override
-    public Optional<Relationship> getRelationship(final String globalCustomerId, final String serviceType,
-            final String serviceInstanceId, final String vnfName) {
-        final Optional<ServiceInstance> optional = getServiceInstance(globalCustomerId, serviceType, serviceInstanceId);
-
-        if (optional.isPresent()) {
-            LOGGER.info("Found service instance ...");
-            final ServiceInstance serviceInstance = optional.get();
-            final RelationshipList relationshipList = serviceInstance.getRelationshipList();
-
-            if (relationshipList != null) {
-                final List<Relationship> relationship = relationshipList.getRelationship();
-                return relationship.stream().filter(
-                        relationShip -> relationShip.getRelatedToProperty().stream().filter(relatedToProperty -> {
-                            final String propertyKey = relatedToProperty.getPropertyKey();
-                            final String propertyValue = relatedToProperty.getPropertyValue();
-                            return GENERIC_VNF_VNF_NAME.equals(propertyKey) && propertyValue != null
-                                    && propertyValue.equals(vnfName);
-                        }).findFirst().isPresent()).findFirst();
-            }
-            LOGGER.warn("Relationship list is nulll ...");
-        }
-        LOGGER.error("Unable to RelationShip with property value: {}... ", vnfName);
-
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<Relationship> addRelationShip(final String globalCustomerId, final String serviceType,
-            final String serviceInstanceId, final Relationship relationship, final String requestUri) {
-        final Optional<ServiceInstance> optional = getServiceInstance(globalCustomerId, serviceType, serviceInstanceId);
-        if (optional.isPresent()) {
-            final ServiceInstance serviceInstance = optional.get();
-            RelationshipList relationshipList = serviceInstance.getRelationshipList();
-            if (relationshipList == null) {
-                relationshipList = new RelationshipList();
-                serviceInstance.setRelationshipList(relationshipList);
-            }
-            relationshipList.getRelationship().add(relationship);
-
-            LOGGER.info("Successfully added relation to ServiceInstance");
-
-            final Relationship resultantRelationship = new Relationship();
-            resultantRelationship.setRelatedTo(GENERIC_VNF);
-            resultantRelationship.setRelationshipLabel(relationship.getRelationshipLabel());
-            resultantRelationship.setRelatedLink(getBiDirectionalRelationShipListRelatedLink(requestUri));
-
-            final List<RelationshipData> relationshipDataList = resultantRelationship.getRelationshipData();
-            relationshipDataList.add(getRelationshipData(CUSTOMER_GLOBAL_CUSTOMER_ID, globalCustomerId));
-            relationshipDataList.add(getRelationshipData(SERVICE_SUBSCRIPTION_SERVICE_TYPE, serviceType));
-            relationshipDataList.add(getRelationshipData(SERVICE_INSTANCE_SERVICE_INSTANCE_ID, serviceInstanceId));
-
-            final List<RelatedToProperty> relatedToProperty = resultantRelationship.getRelatedToProperty();
-            relatedToProperty.add(getRelatedToProperty(SERVICE_INSTANCE_SERVICE_INSTANCE_NAME,
-                    serviceInstance.getServiceInstanceName()));
-
-            return Optional.of(resultantRelationship);
-
-        }
-        LOGGER.error("Unable to find ServiceInstance ...");
-        return Optional.empty();
-    }
-
-    @Override
-    public void clearAll() {
-        clearCache(CUSTOMER_CACHE.getName());
-    }
-
-    private RelatedToProperty getRelatedToProperty(final String key, final String value) {
-        final RelatedToProperty relatedToProperty = new RelatedToProperty();
-        relatedToProperty.setPropertyKey(key);
-        relatedToProperty.setPropertyValue(value);
-        return relatedToProperty;
-    }
-
-    private RelationshipData getRelationshipData(final String key, final String value) {
-        final RelationshipData relationshipData = new RelationshipData();
-        relationshipData.setRelationshipKey(key);
-        relationshipData.setRelationshipValue(value);
-        return relationshipData;
-    }
-
-
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProvider.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProvider.java
deleted file mode 100755
index b1f90215..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProvider.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import java.util.List;
-import java.util.Optional;
-import org.onap.aai.domain.yang.EsrSystemInfo;
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.aai.domain.yang.EsrVnfm;
-import org.onap.aai.domain.yang.Relationship;
-import org.springframework.http.HttpHeaders;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public interface ExternalSystemCacheServiceProvider extends Clearable {
-
-    void putEsrVnfm(final String vnfmId, final EsrVnfm esrVnfm);
-
-    Optional<EsrVnfm> getEsrVnfm(final String vnfmId);
-
-    List<EsrVnfm> getAllEsrVnfm();
-
-    Optional<EsrSystemInfoList> getEsrSystemInfoList(final String vnfmId);
-
-    boolean putEsrSystemInfo(final String vnfmId, final String esrSystemInfoId, final EsrSystemInfo esrSystemInfo);
-
-    boolean addRelationShip(final HttpHeaders incomingHeader, final String targetBaseUrl, final String requestURI,
-            final String vnfmId, Relationship relationship);
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProviderImpl.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProviderImpl.java
deleted file mode 100755
index b5b1da0f..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProviderImpl.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import static org.onap.so.aaisimulator.utils.CacheName.ESR_VNFM_CACHE;
-import static org.onap.so.aaisimulator.utils.Constants.DEPENDS_ON;
-import static org.onap.so.aaisimulator.utils.Constants.ESR_VNFM;
-import static org.onap.so.aaisimulator.utils.Constants.ESR_VNFM_VNFM_ID;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getRelationShipListRelatedLink;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getTargetUrl;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import org.onap.aai.domain.yang.EsrSystemInfo;
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.aai.domain.yang.EsrVnfm;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.RelationshipList;
-import org.onap.so.simulator.cache.provider.AbstractCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.http.HttpHeaders;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@Service
-public class ExternalSystemCacheServiceProviderImpl extends AbstractCacheServiceProvider
-        implements ExternalSystemCacheServiceProvider {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ExternalSystemCacheServiceProviderImpl.class);
-
-    private final HttpRestServiceProvider httpRestServiceProvider;
-
-    @Autowired
-    public ExternalSystemCacheServiceProviderImpl(final CacheManager cacheManager,
-            final HttpRestServiceProvider httpRestServiceProvider) {
-        super(cacheManager);
-        this.httpRestServiceProvider = httpRestServiceProvider;
-
-    }
-
-    @Override
-    public void putEsrVnfm(final String vnfmId, final EsrVnfm esrVnfm) {
-        LOGGER.info("Adding esrVnfm: {} with name to cache", esrVnfm);
-        final Cache cache = getCache(ESR_VNFM_CACHE.getName());
-        cache.put(vnfmId, esrVnfm);
-    }
-
-    @Override
-    public Optional<EsrVnfm> getEsrVnfm(final String vnfmId) {
-        LOGGER.info("getting EsrVnfm from cache using key: {}", vnfmId);
-        final Cache cache = getCache(ESR_VNFM_CACHE.getName());
-        final EsrVnfm value = cache.get(vnfmId, EsrVnfm.class);
-        if (value != null) {
-            return Optional.of(value);
-        }
-        LOGGER.error("Unable to find EsrVnfm in cache using vnfmId: {} ", vnfmId);
-        return Optional.empty();
-    }
-
-    @Override
-    public List<EsrVnfm> getAllEsrVnfm() {
-        final Cache cache = getCache(ESR_VNFM_CACHE.getName());
-        if (cache != null) {
-            final Object nativeCache = cache.getNativeCache();
-            if (nativeCache instanceof ConcurrentHashMap) {
-                @SuppressWarnings("unchecked")
-                final ConcurrentHashMap<Object, Object> concurrentHashMap =
-                        (ConcurrentHashMap<Object, Object>) nativeCache;
-                final List<EsrVnfm> result = new ArrayList<>();
-                concurrentHashMap.keySet().stream().forEach(key -> {
-                    final Optional<EsrVnfm> optional = getEsrVnfm(key.toString());
-                    if (optional.isPresent()) {
-                        result.add(optional.get());
-                    }
-                });
-                return result;
-            }
-        }
-        LOGGER.error("Unable to get all esr vnfms ... ");
-        return Collections.emptyList();
-
-    }
-
-    @Override
-    public Optional<EsrSystemInfoList> getEsrSystemInfoList(final String vnfmId) {
-        final Optional<EsrVnfm> optional = getEsrVnfm(vnfmId);
-        if (optional.isPresent()) {
-            final EsrVnfm esrVnfm = optional.get();
-            if (esrVnfm.getEsrSystemInfoList() != null) {
-                return Optional.of(esrVnfm.getEsrSystemInfoList());
-            }
-            LOGGER.error("EsrSystemInfoList is null for vnfmId: {} ", vnfmId);
-        }
-        LOGGER.error("Unable to find EsrVnfm in cache using vnfmId: {} ", vnfmId);
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean putEsrSystemInfo(final String vnfmId, final String esrSystemInfoId,
-            final EsrSystemInfo esrSystemInfo) {
-        final Optional<EsrVnfm> optional = getEsrVnfm(vnfmId);
-        if (optional.isPresent()) {
-            final EsrVnfm esrVnfm = optional.get();
-            final List<EsrSystemInfo> esrSystemInfoList = getEsrSystemInfoList(esrVnfm);
-
-            final Optional<EsrSystemInfo> existingEsrSystemInfo =
-                    esrSystemInfoList.stream().filter(existing -> existing.getEsrSystemInfoId() != null
-                            && existing.getEsrSystemInfoId().equals(esrSystemInfoId)).findFirst();
-            if (existingEsrSystemInfo.isPresent()) {
-                LOGGER.error("EsrSystemInfo already exists {}", existingEsrSystemInfo.get());
-                return false;
-            }
-
-            return esrSystemInfoList.add(esrSystemInfo);
-        }
-        LOGGER.error("Unable to add EsrSystemInfo in cache for vnfmId: {} ", vnfmId);
-        return false;
-    }
-
-    @Override
-    public boolean addRelationShip(final HttpHeaders incomingHeader, final String targetBaseUrl,
-            final String requestUriString, final String vnfmId, final Relationship relationship) {
-        try {
-            final Optional<EsrVnfm> optional = getEsrVnfm(vnfmId);
-            if (optional.isPresent()) {
-                final EsrVnfm esrVnfm = optional.get();
-                final String targetUrl = getTargetUrl(targetBaseUrl, relationship.getRelatedLink());
-                final Relationship outGoingRelationShip =
-                        getRelationship(getRelationShipListRelatedLink(requestUriString), esrVnfm);
-                final Optional<Relationship> optionalRelationship = httpRestServiceProvider.put(incomingHeader,
-                        outGoingRelationShip, targetUrl, Relationship.class);
-                if (optionalRelationship.isPresent()) {
-                    final Relationship resultantRelationship = optionalRelationship.get();
-
-                    RelationshipList relationshipList = esrVnfm.getRelationshipList();
-                    if (relationshipList == null) {
-                        relationshipList = new RelationshipList();
-                        esrVnfm.setRelationshipList(relationshipList);
-                    }
-                    if (relationshipList.getRelationship().add(resultantRelationship)) {
-                        LOGGER.info("added relationship {} in cache successfully", resultantRelationship);
-                        return true;
-                    }
-                }
-            }
-        } catch (final Exception exception) {
-            LOGGER.error("Unable to add two-way relationship for vnfmId: {}", vnfmId, exception);
-        }
-        LOGGER.error("Unable to add relationship in cache for vnfmId: {}", vnfmId);
-        return false;
-    }
-
-    private Relationship getRelationship(final String relatedLink, final EsrVnfm esrVnfm) {
-        final Relationship relationShip = new Relationship();
-        relationShip.setRelatedTo(ESR_VNFM);
-        relationShip.setRelationshipLabel(DEPENDS_ON);
-        relationShip.setRelatedLink(relatedLink);
-
-        final RelationshipData relationshipData = new RelationshipData();
-        relationshipData.setRelationshipKey(ESR_VNFM_VNFM_ID);
-        relationshipData.setRelationshipValue(esrVnfm.getVnfmId());
-        relationShip.getRelationshipData().add(relationshipData);
-
-        return relationShip;
-    }
-
-    private List<EsrSystemInfo> getEsrSystemInfoList(final EsrVnfm esrVnfm) {
-        EsrSystemInfoList esrSystemInfoList = esrVnfm.getEsrSystemInfoList();
-        if (esrSystemInfoList == null) {
-            esrSystemInfoList = new EsrSystemInfoList();
-            esrVnfm.setEsrSystemInfoList(esrSystemInfoList);
-        }
-        return esrSystemInfoList.getEsrSystemInfo();
-    }
-
-    @Override
-    public void clearAll() {
-        clearCache(ESR_VNFM_CACHE.getName());
-
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProvider.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProvider.java
deleted file mode 100755
index 901c2594..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProvider.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import java.util.List;
-import java.util.Optional;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.Relationship;
-import org.springframework.http.HttpHeaders;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public interface GenericVnfCacheServiceProvider extends Clearable {
-
-    void putGenericVnf(final String vnfId, final GenericVnf genericVnf);
-
-    Optional<GenericVnf> getGenericVnf(final String vnfId);
-
-    Optional<Relationship> addRelationShip(final String vnfId, final Relationship relationship,
-            final String requestURI);
-
-    boolean addRelationShip(final HttpHeaders incomingHeader, final String targetBaseUrl, final String requestUriString,
-            final String vnfId, final Relationship relationship);
-
-    Optional<String> getGenericVnfId(final String vnfName);
-
-    boolean patchGenericVnf(final String vnfId, final GenericVnf genericVnf);
-
-    List<GenericVnf> getGenericVnfs(final String selflink);
-
-    boolean deleteGenericVnf(final String vnfId, final String resourceVersion);
-
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProviderImpl.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProviderImpl.java
deleted file mode 100755
index e7a42106..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProviderImpl.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import static org.onap.so.aaisimulator.utils.CacheName.GENERIC_VNF_CACHE;
-import static org.onap.so.aaisimulator.utils.Constants.COMPOSED_OF;
-import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF;
-import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF_VNF_ID;
-import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF_VNF_NAME;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getBiDirectionalRelationShipListRelatedLink;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getRelationShipListRelatedLink;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getTargetUrl;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.RelatedToProperty;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.RelationshipList;
-import org.onap.so.aaisimulator.utils.ShallowBeanCopy;
-import org.onap.so.simulator.cache.provider.AbstractCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.http.HttpHeaders;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@Service
-public class GenericVnfCacheServiceProviderImpl extends AbstractCacheServiceProvider
-        implements GenericVnfCacheServiceProvider {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(GenericVnfCacheServiceProviderImpl.class);
-
-    private final HttpRestServiceProvider httpRestServiceProvider;
-
-    @Autowired
-    public GenericVnfCacheServiceProviderImpl(final CacheManager cacheManager,
-            final HttpRestServiceProvider httpRestServiceProvider) {
-        super(cacheManager);
-        this.httpRestServiceProvider = httpRestServiceProvider;
-    }
-
-    @Override
-    public void putGenericVnf(final String vnfId, final GenericVnf genericVnf) {
-        LOGGER.info("Adding customer: {} with key: {} in cache ...", genericVnf, vnfId);
-        final Cache cache = getCache(GENERIC_VNF_CACHE.getName());
-        cache.put(vnfId, genericVnf);
-    }
-
-    @Override
-    public Optional<GenericVnf> getGenericVnf(final String vnfId) {
-        LOGGER.info("getting GenericVnf from cache using key: {}", vnfId);
-        final Cache cache = getCache(GENERIC_VNF_CACHE.getName());
-        final GenericVnf value = cache.get(vnfId, GenericVnf.class);
-        if (value != null) {
-            return Optional.of(value);
-        }
-        LOGGER.error("Unable to find GenericVnf ...");
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<String> getGenericVnfId(final String vnfName) {
-        final Cache cache = getCache(GENERIC_VNF_CACHE.getName());
-        if (cache != null) {
-            final Object nativeCache = cache.getNativeCache();
-            if (nativeCache instanceof ConcurrentHashMap) {
-                @SuppressWarnings("unchecked")
-                final ConcurrentHashMap<Object, Object> concurrentHashMap =
-                        (ConcurrentHashMap<Object, Object>) nativeCache;
-                for (final Object key : concurrentHashMap.keySet()) {
-                    final Optional<GenericVnf> optional = getGenericVnf(key.toString());
-                    if (optional.isPresent()) {
-                        final GenericVnf value = optional.get();
-                        final String genericVnfName = value.getVnfName();
-                        if (genericVnfName != null && genericVnfName.equals(vnfName)) {
-                            final String genericVnfId = value.getVnfId();
-                            LOGGER.info("Found matching vnf for name: {}, vnf-id: {}", genericVnfName, genericVnfId);
-                            return Optional.of(genericVnfId);
-                        }
-                    }
-                }
-            }
-        }
-        LOGGER.error("No match found for vnf name: {}", vnfName);
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean addRelationShip(final HttpHeaders incomingHeader, final String targetBaseUrl,
-            final String requestUriString, final String vnfId, final Relationship relationship) {
-        try {
-            final Optional<GenericVnf> optional = getGenericVnf(vnfId);
-            if (optional.isPresent()) {
-                final GenericVnf genericVnf = optional.get();
-                final String targetUrl = getTargetUrl(targetBaseUrl, relationship.getRelatedLink());
-                final Relationship outGoingRelationShip =
-                        getRelationship(getRelationShipListRelatedLink(requestUriString), genericVnf, COMPOSED_OF);
-                final Optional<Relationship> optionalRelationship = httpRestServiceProvider.put(incomingHeader,
-                        outGoingRelationShip, targetUrl, Relationship.class);
-                if (optionalRelationship.isPresent()) {
-                    final Relationship resultantRelationship = optionalRelationship.get();
-
-                    RelationshipList relationshipList = genericVnf.getRelationshipList();
-                    if (relationshipList == null) {
-                        relationshipList = new RelationshipList();
-                        genericVnf.setRelationshipList(relationshipList);
-                    }
-                    if (relationshipList.getRelationship().add(resultantRelationship)) {
-                        LOGGER.info("added relationship {} in cache successfully", resultantRelationship);
-                        return true;
-                    }
-                }
-            }
-        } catch (final Exception exception) {
-            LOGGER.error("Unable to add two-way relationship for vnfId: {}", vnfId, exception);
-        }
-        LOGGER.error("Unable to add relationship in cache for vnfId: {}", vnfId);
-        return false;
-    }
-
-    @Override
-    public Optional<Relationship> addRelationShip(final String vnfId, final Relationship relationship,
-            final String requestURI) {
-        final Optional<GenericVnf> optional = getGenericVnf(vnfId);
-        if (optional.isPresent()) {
-            final GenericVnf genericVnf = optional.get();
-            RelationshipList relationshipList = genericVnf.getRelationshipList();
-            if (relationshipList == null) {
-                relationshipList = new RelationshipList();
-                genericVnf.setRelationshipList(relationshipList);
-            }
-            relationshipList.getRelationship().add(relationship);
-            LOGGER.info("Successfully added relation to GenericVnf for vnfId: {}", vnfId);
-
-            final String relatedLink = getBiDirectionalRelationShipListRelatedLink(requestURI);
-            final Relationship resultantRelationship =
-                    getRelationship(relatedLink, genericVnf, relationship.getRelationshipLabel());
-            return Optional.of(resultantRelationship);
-        }
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean patchGenericVnf(final String vnfId, final GenericVnf genericVnf) {
-        final Optional<GenericVnf> optional = getGenericVnf(vnfId);
-        if (optional.isPresent()) {
-            final GenericVnf cachedGenericVnf = optional.get();
-            try {
-                ShallowBeanCopy.copy(genericVnf, cachedGenericVnf);
-                return true;
-            } catch (final Exception exception) {
-                LOGGER.error("Unable to update GenericVnf for vnfId: {}", vnfId, exception);
-            }
-        }
-        LOGGER.error("Unable to find GenericVnf ...");
-        return false;
-    }
-
-    @Override
-    public List<GenericVnf> getGenericVnfs(final String selflink) {
-        final Cache cache = getCache(GENERIC_VNF_CACHE.getName());
-        if (cache != null) {
-            final Object nativeCache = cache.getNativeCache();
-            if (nativeCache instanceof ConcurrentHashMap) {
-                @SuppressWarnings("unchecked")
-                final ConcurrentHashMap<Object, Object> concurrentHashMap =
-                        (ConcurrentHashMap<Object, Object>) nativeCache;
-                final List<GenericVnf> result = new ArrayList<>();
-
-                concurrentHashMap.keySet().stream().forEach(key -> {
-                    final Optional<GenericVnf> optional = getGenericVnf(key.toString());
-                    if (optional.isPresent()) {
-                        final GenericVnf genericVnf = optional.get();
-                        final String genericVnfSelfLink = genericVnf.getSelflink();
-                        final String genericVnfId = genericVnf.getSelflink();
-
-                        if (genericVnfSelfLink != null && genericVnfSelfLink.equals(selflink)) {
-                            LOGGER.info("Found matching vnf for selflink: {}, vnf-id: {}", genericVnfSelfLink,
-                                    genericVnfId);
-                            result.add(genericVnf);
-                        }
-                    }
-                });
-                return result;
-            }
-        }
-        LOGGER.error("No match found for selflink: {}", selflink);
-        return Collections.emptyList();
-    }
-
-    @Override
-    public boolean deleteGenericVnf(final String vnfId, final String resourceVersion) {
-        final Optional<GenericVnf> optional = getGenericVnf(vnfId);
-        if (optional.isPresent()) {
-            final GenericVnf genericVnf = optional.get();
-            if (genericVnf.getResourceVersion() != null && genericVnf.getResourceVersion().equals(resourceVersion)) {
-                final Cache cache = getCache(GENERIC_VNF_CACHE.getName());
-                LOGGER.info("Will evict GenericVnf from cache with vnfId: {}", genericVnf.getVnfId());
-                cache.evict(vnfId);
-                return true;
-            }
-        }
-        LOGGER.error("Unable to find GenericVnf for vnfId: {} and resourceVersion: {} ...", vnfId, resourceVersion);
-        return false;
-    }
-
-    private Relationship getRelationship(final String relatedLink, final GenericVnf genericVnf,
-            final String relationshipLabel) {
-        final Relationship relationShip = new Relationship();
-        relationShip.setRelatedTo(GENERIC_VNF);
-        relationShip.setRelationshipLabel(relationshipLabel);
-        relationShip.setRelatedLink(relatedLink);
-
-        final RelationshipData relationshipData = new RelationshipData();
-        relationshipData.setRelationshipKey(GENERIC_VNF_VNF_ID);
-        relationshipData.setRelationshipValue(genericVnf.getVnfId());
-        relationShip.getRelationshipData().add(relationshipData);
-
-        final RelatedToProperty relatedToProperty = new RelatedToProperty();
-        relatedToProperty.setPropertyKey(GENERIC_VNF_VNF_NAME);
-        relatedToProperty.setPropertyValue(genericVnf.getVnfName());
-        relationShip.getRelatedToProperty().add(relatedToProperty);
-        return relationShip;
-    }
-
-    @Override
-    public void clearAll() {
-        clearCache(GENERIC_VNF_CACHE.getName());
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProvider.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProvider.java
deleted file mode 100755
index bbcc435b..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import java.util.Optional;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.ResponseEntity;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public interface HttpRestServiceProvider {
-
-    <T> ResponseEntity<T> invokeHttpPut(final HttpEntity<Object> httpEntity, final String url, final Class<T> clazz);
-
-    <T> Optional<T> put(final HttpHeaders headers, final Object object, final String url, final Class<T> clazz);
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProviderImpl.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProviderImpl.java
deleted file mode 100755
index b96920f0..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProviderImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import java.util.Optional;
-import org.onap.so.aaisimulator.exception.InvalidRestRequestException;
-import org.onap.so.aaisimulator.exception.RestProcessingException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.RestClientException;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@Service
-public class HttpRestServiceProviderImpl implements HttpRestServiceProvider {
-    private static final Logger LOGGER = LoggerFactory.getLogger(HttpRestServiceProviderImpl.class);
-
-    private final RestTemplate restTemplate;
-
-    @Autowired
-    public HttpRestServiceProviderImpl(final RestTemplate restTemplate) {
-        this.restTemplate = restTemplate;
-    }
-
-    @Override
-    public <T> ResponseEntity<T> invokeHttpPut(final HttpEntity<Object> httpEntity, final String url,
-            final Class<T> clazz) {
-
-        final HttpMethod httpMethod = HttpMethod.PUT;
-        LOGGER.trace("Will invoke HTTP {} using URL: {}", httpMethod, url);
-        try {
-            return restTemplate.exchange(url, httpMethod, httpEntity, clazz);
-
-        } catch (final HttpClientErrorException httpClientErrorException) {
-            final String message = "Unable to invoke HTTP " + httpMethod + " using url: " + url + ", Response: "
-                    + httpClientErrorException.getRawStatusCode();
-            LOGGER.error(message, httpClientErrorException);
-            final int rawStatusCode = httpClientErrorException.getRawStatusCode();
-            if (rawStatusCode == HttpStatus.BAD_REQUEST.value() || rawStatusCode == HttpStatus.NOT_FOUND.value()) {
-                throw new InvalidRestRequestException("No result found for given url: " + url);
-            }
-            throw new RestProcessingException("Unable to invoke HTTP " + httpMethod + " using URL: " + url);
-
-        } catch (final RestClientException restClientException) {
-            LOGGER.error("Unable to invoke HTTP POST using url: {}", url, restClientException);
-            throw new RestProcessingException("Unable to invoke HTTP " + httpMethod + " using URL: " + url,
-                    restClientException);
-        }
-    }
-
-    @Override
-    public <T> Optional<T> put(final HttpHeaders headers, final Object object, final String url, final Class<T> clazz) {
-        final HttpEntity<Object> httpEntity = new HttpEntity<Object>(object, headers);
-        final ResponseEntity<T> response = invokeHttpPut(httpEntity, url, clazz);
-
-        if (!response.getStatusCode().equals(HttpStatus.OK) && !response.getStatusCode().equals(HttpStatus.CREATED)
-                && !response.getStatusCode().equals(HttpStatus.ACCEPTED)) {
-            final String message = "Unable to invoke HTTP " + HttpMethod.PUT + " using URL: " + url
-                    + ", Response Code: " + response.getStatusCode();
-            LOGGER.error(message);
-            return Optional.empty();
-        }
-
-        if (response.hasBody()) {
-            return Optional.of(response.getBody());
-        }
-        LOGGER.error("Received response without body status code: {}", response.getStatusCode());
-        return Optional.empty();
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProvider.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProvider.java
deleted file mode 100755
index dbf5490f..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProvider.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import java.util.Optional;
-import org.onap.aai.domain.yang.LineOfBusiness;
-import org.onap.aai.domain.yang.Relationship;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public interface LinesOfBusinessCacheServiceProvider extends Clearable {
-
-    void putLineOfBusiness(final String lineOfBusinessName, final LineOfBusiness lineOfBusiness);
-
-    Optional<LineOfBusiness> getLineOfBusiness(final String lineOfBusinessName);
-
-    Optional<Relationship> addRelationShip(final String lineOfBusinessName, final Relationship relationship,
-            final String requestURI);
-
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProviderImpl.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProviderImpl.java
deleted file mode 100755
index 7614cb6d..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProviderImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import static org.onap.so.aaisimulator.utils.CacheName.LINES_OF_BUSINESS_CACHE;
-import static org.onap.so.aaisimulator.utils.Constants.LINE_OF_BUSINESS;
-import static org.onap.so.aaisimulator.utils.Constants.LINE_OF_BUSINESS_LINE_OF_BUSINESS_NAME;
-import static org.onap.so.aaisimulator.utils.Constants.USES;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getBiDirectionalRelationShipListRelatedLink;
-import java.util.Optional;
-import org.onap.aai.domain.yang.LineOfBusiness;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.RelationshipList;
-import org.onap.so.simulator.cache.provider.AbstractCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@Service
-public class LinesOfBusinessCacheServiceProviderImpl extends AbstractCacheServiceProvider
-        implements LinesOfBusinessCacheServiceProvider {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(LinesOfBusinessCacheServiceProviderImpl.class);
-
-    @Autowired
-    public LinesOfBusinessCacheServiceProviderImpl(final CacheManager cacheManager) {
-        super(cacheManager);
-    }
-
-    @Override
-    public void putLineOfBusiness(final String lineOfBusinessName, final LineOfBusiness lineOfBusiness) {
-        LOGGER.info("Adding LineOfBusiness to cache with key: {} ...", lineOfBusinessName);
-        final Cache cache = getCache(LINES_OF_BUSINESS_CACHE.getName());
-        cache.put(lineOfBusinessName, lineOfBusiness);
-
-    }
-
-    @Override
-    public Optional<LineOfBusiness> getLineOfBusiness(final String lineOfBusinessName) {
-        LOGGER.info("getting LineOfBusiness from cache using key: {}", lineOfBusinessName);
-        final Cache cache = getCache(LINES_OF_BUSINESS_CACHE.getName());
-        final LineOfBusiness value = cache.get(lineOfBusinessName, LineOfBusiness.class);
-        if (value != null) {
-            return Optional.of(value);
-        }
-        LOGGER.error("Unable to find LineOfBusiness in cache using key:{} ", lineOfBusinessName);
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<Relationship> addRelationShip(final String lineOfBusinessName, final Relationship relationship,
-            final String requestUri) {
-        final Optional<LineOfBusiness> optional = getLineOfBusiness(lineOfBusinessName);
-        if (optional.isPresent()) {
-            final LineOfBusiness lineOfBusiness = optional.get();
-            RelationshipList relationshipList = lineOfBusiness.getRelationshipList();
-            if (relationshipList == null) {
-                relationshipList = new RelationshipList();
-                lineOfBusiness.setRelationshipList(relationshipList);
-            }
-            relationshipList.getRelationship().add(relationship);
-
-            LOGGER.info("Successfully added relation to LineOfBusiness with name: {}", lineOfBusinessName);
-            final Relationship resultantRelationship = new Relationship();
-            resultantRelationship.setRelatedTo(LINE_OF_BUSINESS);
-            resultantRelationship.setRelationshipLabel(USES);
-            resultantRelationship.setRelatedLink(getBiDirectionalRelationShipListRelatedLink(requestUri));
-
-            final RelationshipData relationshipData = new RelationshipData();
-            relationshipData.setRelationshipKey(LINE_OF_BUSINESS_LINE_OF_BUSINESS_NAME);
-            relationshipData.setRelationshipValue(lineOfBusiness.getLineOfBusinessName());
-            resultantRelationship.getRelationshipData().add(relationshipData);
-
-            return Optional.of(resultantRelationship);
-
-        }
-        LOGGER.error("Unable to find LineOfBusiness using name: {} ...", lineOfBusinessName);
-        return Optional.empty();
-    }
-
-    @Override
-    public void clearAll() {
-        clearCache(LINES_OF_BUSINESS_CACHE.getName());
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProvider.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProvider.java
deleted file mode 100755
index 02327469..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import java.util.Optional;
-import org.onap.aai.domain.yang.GenericVnfs;
-import org.onap.aai.domain.yang.ServiceInstance;
-import org.onap.so.aaisimulator.models.NodeServiceInstance;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public interface NodesCacheServiceProvider extends Clearable {
-
-    void putNodeServiceInstance(final String serviceInstanceId, final NodeServiceInstance nodeServiceInstance);
-
-    Optional<NodeServiceInstance> getNodeServiceInstance(final String serviceInstanceId);
-
-    Optional<GenericVnfs> getGenericVnfs(final String vnfName);
-
-    Optional<ServiceInstance> getServiceInstance(final NodeServiceInstance nodeServiceInstance);
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProviderImpl.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProviderImpl.java
deleted file mode 100755
index 4ea255f5..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProviderImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import static org.onap.so.aaisimulator.utils.CacheName.NODES_CACHE;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.GenericVnfs;
-import org.onap.aai.domain.yang.ServiceInstance;
-import org.onap.so.aaisimulator.models.NodeServiceInstance;
-import org.onap.so.simulator.cache.provider.AbstractCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.stereotype.Service;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@Service
-public class NodesCacheServiceProviderImpl extends AbstractCacheServiceProvider implements NodesCacheServiceProvider {
-    private static final Logger LOGGER = LoggerFactory.getLogger(NodesCacheServiceProviderImpl.class);
-    private final GenericVnfCacheServiceProvider cacheServiceProvider;
-    private final CustomerCacheServiceProvider customerCacheServiceProvider;
-
-
-    @Autowired
-    public NodesCacheServiceProviderImpl(final CacheManager cacheManager,
-            final GenericVnfCacheServiceProvider cacheServiceProvider,
-            final CustomerCacheServiceProvider customerCacheServiceProvider) {
-        super(cacheManager);
-        this.cacheServiceProvider = cacheServiceProvider;
-        this.customerCacheServiceProvider = customerCacheServiceProvider;
-    }
-
-    @Override
-    public void putNodeServiceInstance(final String serviceInstanceId, final NodeServiceInstance nodeServiceInstance) {
-        final Cache cache = getCache(NODES_CACHE.getName());
-        LOGGER.info("Adding {} to cache with key: {}...", nodeServiceInstance, serviceInstanceId);
-        cache.put(serviceInstanceId, nodeServiceInstance);
-    }
-
-    @Override
-    public Optional<NodeServiceInstance> getNodeServiceInstance(final String serviceInstanceId) {
-        final Cache cache = getCache(NODES_CACHE.getName());
-        final NodeServiceInstance value = cache.get(serviceInstanceId, NodeServiceInstance.class);
-        if (value != null) {
-            return Optional.of(value);
-        }
-        LOGGER.error("Unable to find node service instance in cache using key:{} ", serviceInstanceId);
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<GenericVnfs> getGenericVnfs(final String vnfName) {
-        final Optional<String> genericVnfId = cacheServiceProvider.getGenericVnfId(vnfName);
-        if (genericVnfId.isPresent()) {
-            final Optional<GenericVnf> genericVnf = cacheServiceProvider.getGenericVnf(genericVnfId.get());
-            if (genericVnf.isPresent()) {
-                final GenericVnfs genericVnfs = new GenericVnfs();
-                genericVnfs.getGenericVnf().add(genericVnf.get());
-                return Optional.of(genericVnfs);
-            }
-        }
-        LOGGER.error("Unable to find GenericVnf for name: {}", vnfName);
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<ServiceInstance> getServiceInstance(final NodeServiceInstance nodeServiceInstance) {
-        return customerCacheServiceProvider.getServiceInstance(nodeServiceInstance.getGlobalCustomerId(),
-                nodeServiceInstance.getServiceType(), nodeServiceInstance.getServiceInstanceId());
-    }
-
-    @Override
-    public void clearAll() {
-        final Cache cache = getCache(NODES_CACHE.getName());
-        final ConcurrentHashMap<?, ?> nativeCache = (ConcurrentHashMap<?, ?>) cache.getNativeCache();
-        LOGGER.info("Clear all entries from cahce: {}", cache.getName());
-        nativeCache.clear();
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProvider.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProvider.java
deleted file mode 100755
index 394ecf17..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProvider.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import java.util.Optional;
-import org.onap.aai.domain.yang.OwningEntity;
-import org.onap.aai.domain.yang.Relationship;
-import org.springframework.http.HttpHeaders;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public interface OwnEntityCacheServiceProvider extends Clearable {
-
-    void putOwningEntity(final String owningEntityId, final OwningEntity owningEntity);
-
-    Optional<OwningEntity> getOwningEntity(final String owningEntityId);
-
-    boolean addRelationShip(final HttpHeaders incomingHeader, final String targetBaseUrl, final String requestUriString,
-            final String owningEntityId, final Relationship relationship);
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProviderImpl.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProviderImpl.java
deleted file mode 100755
index e351c757..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProviderImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import static org.onap.so.aaisimulator.utils.CacheName.OWNING_ENTITY_CACHE;
-import static org.onap.so.aaisimulator.utils.Constants.BELONGS_TO;
-import static org.onap.so.aaisimulator.utils.Constants.OWNING_ENTITY;
-import static org.onap.so.aaisimulator.utils.Constants.OWNING_ENTITY_OWNING_ENTITY_ID;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getRelationShipListRelatedLink;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getTargetUrl;
-import java.util.List;
-import java.util.Optional;
-import org.onap.aai.domain.yang.OwningEntity;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.RelationshipList;
-import org.onap.so.simulator.cache.provider.AbstractCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.http.HttpHeaders;
-import org.springframework.stereotype.Service;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@Service
-public class OwnEntityCacheServiceProviderImpl extends AbstractCacheServiceProvider
-        implements OwnEntityCacheServiceProvider {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(OwnEntityCacheServiceProviderImpl.class);
-
-    private final HttpRestServiceProvider httpRestServiceProvider;
-
-
-    @Autowired
-    public OwnEntityCacheServiceProviderImpl(final CacheManager cacheManager,
-            final HttpRestServiceProvider httpRestServiceProvider) {
-        super(cacheManager);
-        this.httpRestServiceProvider = httpRestServiceProvider;
-    }
-
-    @Override
-    public void putOwningEntity(final String owningEntityId, final OwningEntity owningEntity) {
-        LOGGER.info("Adding OwningEntity: {} with name to cache", owningEntityId, owningEntity);
-        final Cache cache = getCache(OWNING_ENTITY_CACHE.getName());
-        cache.put(owningEntityId, owningEntity);
-    }
-
-    @Override
-    public Optional<OwningEntity> getOwningEntity(final String owningEntityId) {
-        LOGGER.info("getting OwningEntity from cache using key: {}", owningEntityId);
-        final Cache cache = getCache(OWNING_ENTITY_CACHE.getName());
-        final OwningEntity value = cache.get(owningEntityId, OwningEntity.class);
-        if (value != null) {
-            return Optional.of(value);
-        }
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean addRelationShip(final HttpHeaders incomingHeader, final String targetBaseUrl,
-            final String requestUriString, final String owningEntityId, final Relationship relationship) {
-        try {
-            final Optional<OwningEntity> optional = getOwningEntity(owningEntityId);
-            if (optional.isPresent()) {
-                final OwningEntity owningEntity = optional.get();
-                final String targetUrl = getTargetUrl(targetBaseUrl, relationship.getRelatedLink());
-                final Relationship outGoingRelationShip = getRelationship(requestUriString, owningEntity);
-
-                final Optional<Relationship> optionalRelationship = httpRestServiceProvider.put(incomingHeader,
-                        outGoingRelationShip, targetUrl, Relationship.class);
-
-                if (optionalRelationship.isPresent()) {
-                    final Relationship resultantRelationship = optionalRelationship.get();
-
-                    RelationshipList relationshipList = owningEntity.getRelationshipList();
-                    if (relationshipList == null) {
-                        relationshipList = new RelationshipList();
-                        owningEntity.setRelationshipList(relationshipList);
-                    }
-                    if (relationshipList.getRelationship().add(resultantRelationship)) {
-                        LOGGER.info("added relationship {} in cache successfully", resultantRelationship);
-                        return true;
-                    }
-                }
-            }
-
-        } catch (final Exception exception) {
-            LOGGER.error("Unable to add two-way relationship for owning entity id: {}", owningEntityId, exception);
-        }
-        LOGGER.error("Unable to add relationship in cache for owning entity id: {}", owningEntityId);
-        return false;
-    }
-
-    @Override
-    public void clearAll() {
-        clearCache(OWNING_ENTITY_CACHE.getName());
-    }
-
-    private Relationship getRelationship(final String requestUriString, final OwningEntity owningEntity) {
-        final Relationship relationShip = new Relationship();
-        relationShip.setRelatedTo(OWNING_ENTITY);
-        relationShip.setRelationshipLabel(BELONGS_TO);
-        relationShip.setRelatedLink(getRelationShipListRelatedLink(requestUriString));
-
-        final List<RelationshipData> relationshipDataList = relationShip.getRelationshipData();
-
-        final RelationshipData relationshipData = new RelationshipData();
-        relationshipData.setRelationshipKey(OWNING_ENTITY_OWNING_ENTITY_ID);
-        relationshipData.setRelationshipValue(owningEntity.getOwningEntityId());
-
-        relationshipDataList.add(relationshipData);
-
-
-        return relationShip;
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProvider.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProvider.java
deleted file mode 100755
index 65788bcd..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import java.util.Optional;
-import org.onap.aai.domain.yang.Platform;
-import org.onap.aai.domain.yang.Relationship;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public interface PlatformCacheServiceProvider extends Clearable {
-
-    void putPlatform(final String platformName, final Platform platform);
-
-    Optional<Platform> getPlatform(final String platformName);
-
-    Optional<Relationship> addRelationShip(final String platformName, final Relationship relationship,
-            final String requestUri);
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProviderImpl.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProviderImpl.java
deleted file mode 100755
index 225885ce..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProviderImpl.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import static org.onap.so.aaisimulator.utils.CacheName.PLATFORM_CACHE;
-import static org.onap.so.aaisimulator.utils.Constants.PLATFORM;
-import static org.onap.so.aaisimulator.utils.Constants.PLATFORM_PLATFORM_NAME;
-import static org.onap.so.aaisimulator.utils.Constants.USES;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getBiDirectionalRelationShipListRelatedLink;
-import java.util.Optional;
-import org.onap.aai.domain.yang.Platform;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.RelationshipList;
-import org.onap.so.simulator.cache.provider.AbstractCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@Service
-public class PlatformCacheServiceProviderImpl extends AbstractCacheServiceProvider
-        implements PlatformCacheServiceProvider {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PlatformCacheServiceProviderImpl.class);
-
-    @Autowired
-    public PlatformCacheServiceProviderImpl(final CacheManager cacheManager) {
-        super(cacheManager);
-    }
-
-    @Override
-    public void putPlatform(final String platformName, final Platform platform) {
-        LOGGER.info("Adding Platform to cache with key: {} ...", platformName);
-        final Cache cache = getCache(PLATFORM_CACHE.getName());
-        cache.put(platformName, platform);
-    }
-
-    @Override
-    public Optional<Platform> getPlatform(final String platformName) {
-        LOGGER.info("getting Platform from cache using key: {}", platformName);
-        final Cache cache = getCache(PLATFORM_CACHE.getName());
-        final Platform value = cache.get(platformName, Platform.class);
-        if (value != null) {
-            return Optional.of(value);
-        }
-        LOGGER.error("Unable to find Platform in cache using key:{} ", platformName);
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<Relationship> addRelationShip(final String platformName, final Relationship relationship,
-            final String requestUri) {
-        final Optional<Platform> optional = getPlatform(platformName);
-        if (optional.isPresent()) {
-            final Platform platform = optional.get();
-            RelationshipList relationshipList = platform.getRelationshipList();
-            if (relationshipList == null) {
-                relationshipList = new RelationshipList();
-                platform.setRelationshipList(relationshipList);
-            }
-            relationshipList.getRelationship().add(relationship);
-
-            LOGGER.info("Successfully add relation to Platform with name: {}", platformName);
-
-            final Relationship resultantRelationship = new Relationship();
-            resultantRelationship.setRelatedTo(PLATFORM);
-            resultantRelationship.setRelationshipLabel(USES);
-            resultantRelationship.setRelatedLink(getBiDirectionalRelationShipListRelatedLink(requestUri));
-
-            final RelationshipData relationshipData = new RelationshipData();
-            relationshipData.setRelationshipKey(PLATFORM_PLATFORM_NAME);
-            relationshipData.setRelationshipValue(platform.getPlatformName());
-            resultantRelationship.getRelationshipData().add(relationshipData);
-
-            return Optional.of(resultantRelationship);
-        }
-        LOGGER.error("Unable to find Platform ...");
-        return Optional.empty();
-    }
-
-    @Override
-    public void clearAll() {
-        clearCache(PLATFORM_CACHE.getName());
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProvider.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProvider.java
deleted file mode 100755
index 89610e04..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProvider.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import org.onap.aai.domain.yang.v15.Pnf;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * @author Raj Gumma (raj.gumma@est.tech)
- */
-public interface PnfCacheServiceProvider extends Clearable {
-
-    void putPnf(final String pnfId, final Pnf pnf);
-
-    Optional<Pnf> getPnf(final String pnfId);
-
-    Optional<String> getPnfId(final String pnfName);
-
-    boolean patchPnf(final String pnfId, final Pnf pnf);
-
-    List<Pnf> getPnfs(final String selflink);
-
-    boolean deletePnf(final String pnfId, final String resourceVersion);
-
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProviderImpl.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProviderImpl.java
deleted file mode 100755
index cef6c5ab..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProviderImpl.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import org.onap.aai.domain.yang.v15.Pnf;
-import org.onap.so.aaisimulator.utils.ShallowBeanCopy;
-import org.onap.so.simulator.cache.provider.AbstractCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.onap.so.aaisimulator.utils.CacheName.PNF_CACHE;
-
-/**
- * @author Raj Gumma (raj.gumma@est.tech)
- */
-@Service
-public class PnfCacheServiceProviderImpl extends AbstractCacheServiceProvider implements PnfCacheServiceProvider {
-
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PnfCacheServiceProvider.class);
-
-    private final Cache cache;
-
-    @Autowired
-    public PnfCacheServiceProviderImpl(final CacheManager cacheManager) {
-        super(cacheManager);
-        cache = getCache(PNF_CACHE.getName());
-    }
-
-    @Override
-    public void putPnf(final String pnfId, final Pnf pnf) {
-        LOGGER.info("Adding pnf: {} with key: {} in cache ...", pnf, pnfId);
-        cache.put(pnfId, pnf);
-    }
-
-    @Override
-    public Optional<Pnf> getPnf(final String pnfId) {
-        LOGGER.info("getting Pnf from cache using key: {}", pnfId);
-        final Pnf value = cache.get(pnfId, Pnf.class);
-        return Optional.ofNullable(value);
-    }
-
-    @Override
-    public Optional<String> getPnfId(final String pnfName) {
-        final Object nativeCache = cache.getNativeCache();
-        if (nativeCache instanceof ConcurrentHashMap) {
-            @SuppressWarnings("unchecked") final ConcurrentHashMap<Object, Object> concurrentHashMap =
-                    (ConcurrentHashMap<Object, Object>) nativeCache;
-            for (final Object key : concurrentHashMap.keySet()) {
-                final Optional<Pnf> optional = getPnf(key.toString());
-                if (optional.isPresent()) {
-                    final String cachedPnfName = optional.get().getPnfName();
-                    if (cachedPnfName != null && cachedPnfName.equals(cachedPnfName)) {
-                        final String pnfId = optional.get().getPnfId();
-                        LOGGER.info("Found matching pnf for name: {}, pnf-id: {}", cachedPnfName, pnfId);
-                        return Optional.of(pnfId);
-                    }
-                }
-            }
-        }
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean patchPnf(final String pnfId, final Pnf pnf) {
-        final Optional<Pnf> optional = getPnf(pnfId);
-        if (optional.isPresent()) {
-            final Pnf cachedPnf = optional.get();
-            try {
-                ShallowBeanCopy.copy(pnf, cachedPnf);
-                return true;
-            } catch (final Exception exception) {
-                LOGGER.error("Unable to update Pnf for pnfId: {}", pnfId, exception);
-            }
-        }
-        LOGGER.error("Unable to find Pnf for pnfID : {}", pnfId);
-        return false;
-    }
-
-    @Override
-    public List<Pnf> getPnfs(String selfLink) {
-        final Object nativeCache = cache.getNativeCache();
-        if (nativeCache instanceof ConcurrentHashMap) {
-            @SuppressWarnings("unchecked") final ConcurrentHashMap<Object, Object> concurrentHashMap =
-                    (ConcurrentHashMap<Object, Object>) nativeCache;
-            final List<Pnf> result = new ArrayList<>();
-
-            concurrentHashMap.keySet().stream().forEach(key -> {
-                final Optional<Pnf> optional = getPnf(key.toString());
-                if (optional.isPresent()) {
-                    final Pnf pnf = optional.get();
-                    final String pnfSelfLink = pnf.getSelflink();
-                    final String pnfId = pnf.getSelflink();
-
-                    if (pnfSelfLink != null && pnfSelfLink.equals(selfLink)) {
-                        LOGGER.info("Found matching pnf for selflink: {}, pnf-id: {}", pnfSelfLink,
-                                pnfId);
-                        result.add(pnf);
-                    }
-                }
-            });
-            return result;
-        }
-        LOGGER.error("No match found for selflink: {}", selfLink);
-        return Collections.emptyList();
-    }
-
-    @Override
-    public boolean deletePnf(String pnfId, String resourceVersion) {
-        final Optional<Pnf> optional = getPnf(pnfId);
-        if (optional.isPresent()) {
-            final Pnf pnf = optional.get();
-            if (pnf.getResourceVersion() != null && pnf.getResourceVersion().equals(resourceVersion)) {
-                LOGGER.info("Will evict pnf from cache with pnfId: {}", pnf.getPnfId());
-                cache.evict(pnfId);
-                return true;
-            }
-        }
-        LOGGER.error("Unable to find Pnf for pnfId: {} and resourceVersion: {} ...", pnfId, resourceVersion);
-        return false;
-    }
-
-    @Override
-    public void clearAll() {
-        clearCache(cache.getName());
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProvider.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProvider.java
deleted file mode 100755
index 9aad53f7..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProvider.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import java.util.Optional;
-import org.onap.aai.domain.yang.Project;
-import org.onap.aai.domain.yang.Relationship;
-import org.springframework.http.HttpHeaders;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public interface ProjectCacheServiceProvider extends Clearable {
-
-    void putProject(final String projectName, final Project project);
-
-    Optional<Project> getProject(final String projectName);
-
-    boolean addRelationShip(final HttpHeaders incomingHeader, final String targetBaseUrl, final String requestUri,
-            final String projectName, final Relationship relationship);
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProviderImpl.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProviderImpl.java
deleted file mode 100755
index a2eb7ee2..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProviderImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.service.providers;
-
-import static org.onap.so.aaisimulator.utils.CacheName.PROJECT_CACHE;
-import static org.onap.so.aaisimulator.utils.Constants.PROJECT;
-import static org.onap.so.aaisimulator.utils.Constants.PROJECT_PROJECT_NAME;
-import static org.onap.so.aaisimulator.utils.Constants.USES;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getRelationShipListRelatedLink;
-import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getTargetUrl;
-import java.util.List;
-import java.util.Optional;
-import org.onap.aai.domain.yang.Project;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.RelationshipList;
-import org.onap.so.simulator.cache.provider.AbstractCacheServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.http.HttpHeaders;
-import org.springframework.stereotype.Service;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@Service
-public class ProjectCacheServiceProviderImpl extends AbstractCacheServiceProvider
-        implements ProjectCacheServiceProvider {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ProjectCacheServiceProviderImpl.class);
-
-    private final HttpRestServiceProvider httpRestServiceProvider;
-
-    @Autowired
-    public ProjectCacheServiceProviderImpl(final CacheManager cacheManager,
-            final HttpRestServiceProvider httpRestServiceProvider) {
-        super(cacheManager);
-        this.httpRestServiceProvider = httpRestServiceProvider;
-    }
-
-    @Override
-    public void putProject(final String projectName, final Project project) {
-        LOGGER.info("Adding project: {} with name to cache", project, projectName);
-        final Cache cache = getCache(PROJECT_CACHE.getName());
-        cache.put(projectName, project);
-    }
-
-
-    @Override
-    public Optional<Project> getProject(final String projectName) {
-        LOGGER.info("getting project from cache using key: {}", projectName);
-        final Cache cache = getCache(PROJECT_CACHE.getName());
-        final Project value = cache.get(projectName, Project.class);
-        if (value != null) {
-            return Optional.of(value);
-        }
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean addRelationShip(final HttpHeaders incomingHeader, final String targetBaseUrl,
-            final String requestUriString, final String projectName, final Relationship relationship) {
-        try {
-            final Optional<Project> optional = getProject(projectName);
-
-            if (optional.isPresent()) {
-                final Project project = optional.get();
-                final String targetUrl = getTargetUrl(targetBaseUrl, relationship.getRelatedLink());
-                final Relationship outGoingRelationShip = getRelationship(requestUriString, project);
-
-                final Optional<Relationship> optionalRelationship = httpRestServiceProvider.put(incomingHeader,
-                        outGoingRelationShip, targetUrl, Relationship.class);
-
-                if (optionalRelationship.isPresent()) {
-                    final Relationship resultantRelationship = optionalRelationship.get();
-
-                    RelationshipList relationshipList = project.getRelationshipList();
-                    if (relationshipList == null) {
-                        relationshipList = new RelationshipList();
-                        project.setRelationshipList(relationshipList);
-                    }
-                    if (relationshipList.getRelationship().add(resultantRelationship)) {
-                        LOGGER.info("added relationship {} in cache successfully", resultantRelationship);
-                        return true;
-                    }
-                }
-            }
-        } catch (final Exception exception) {
-            LOGGER.error("Unable to add two-way relationship for project name: {}", projectName, exception);
-        }
-        LOGGER.error("Unable to add relationship in cache for project name: {}", projectName);
-        return false;
-    }
-
-    @Override
-    public void clearAll() {
-        clearCache(PROJECT_CACHE.getName());
-    }
-
-    private Relationship getRelationship(final String requestUriString, final Project project) {
-
-        final Relationship relationShip = new Relationship();
-        relationShip.setRelatedTo(PROJECT);
-        relationShip.setRelationshipLabel(USES);
-        relationShip.setRelatedLink(getRelationShipListRelatedLink(requestUriString));
-
-        final List<RelationshipData> relationshipDataList = relationShip.getRelationshipData();
-
-        final RelationshipData relationshipData = new RelationshipData();
-        relationshipData.setRelationshipKey(PROJECT_PROJECT_NAME);
-        relationshipData.setRelationshipValue(project.getProjectName());
-
-        relationshipDataList.add(relationshipData);
-
-
-        return relationShip;
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/CacheName.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/CacheName.java
deleted file mode 100755
index f38adcca..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/CacheName.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.utils;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public enum CacheName {
-
-    CUSTOMER_CACHE("customer-cache"),
-    PROJECT_CACHE("project-cache"),
-    NODES_CACHE("nodes-cache"),
-    GENERIC_VNF_CACHE("generic-vnf-cache"),
-    PNF_CACHE("pnf-cache"),
-    OWNING_ENTITY_CACHE("owning-entity-cache"),
-    PLATFORM_CACHE("platform-cache"),
-    LINES_OF_BUSINESS_CACHE("lines-of-business-cache"),
-    CLOUD_REGION_CACHE("cloud-region-cache"),
-    ESR_VNFM_CACHE("esr-vnfm-cache");
-
-    private String name;
-
-    private CacheName(final String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java
deleted file mode 100755
index 230dc135..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.utils;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public class Constants {
-
-    public static final String BASE_URL = "/aai/v{version:\\d+}";
-
-    public static final String NODES_URL = BASE_URL + "/nodes";
-
-    public static final String BUSINESS_URL = BASE_URL + "/business";
-
-    public static final String CLOUD_INFRASTRUCTURE_URL = BASE_URL + "/cloud-infrastructure";
-
-    public static final String CLOUD_REGIONS = CLOUD_INFRASTRUCTURE_URL + "/cloud-regions/cloud-region/";
-
-    public static final String CUSTOMER_URL = BUSINESS_URL + "/customers/customer/";
-
-    public static final String PROJECT_URL = BUSINESS_URL + "/projects/project/";
-
-    public static final String OWNING_ENTITY_URL = BUSINESS_URL + "/owning-entities/owning-entity/";
-
-    public static final String PLATFORMS_URL = BUSINESS_URL + "/platforms/platform/";
-
-    public static final String EXTERNAL_SYSTEM_ESR_VNFM_LIST_URL = BASE_URL + "/external-system/esr-vnfm-list";
-
-    public static final String NETWORK_URL = BASE_URL + "/network";
-
-    public static final String GENERIC_VNFS_URL = NETWORK_URL + "/generic-vnfs";
-
-    public static final String PNFS_URL = NETWORK_URL+ "/pnfs";
-
-    public static final String RELATIONSHIP_LIST_RELATIONSHIP_URL = "/relationship-list/relationship";
-
-    public static final String BI_DIRECTIONAL_RELATIONSHIP_LIST_URL =
-            RELATIONSHIP_LIST_RELATIONSHIP_URL + "/bi-directional";
-
-    public static final String LINES_OF_BUSINESS_URL = BUSINESS_URL + "/lines-of-business/line-of-business/";
-
-    public static final String HEALTHY = "healthy";
-
-    public static final String PROJECT = "project";
-
-    public static final String PROJECT_PROJECT_NAME = "project.project-name";
-
-    public static final String OWNING_ENTITY = "owning-entity";
-
-    public static final String OWNING_ENTITY_OWNING_ENTITY_ID = "owning-entity.owning-entity-id";
-
-    public static final String X_HTTP_METHOD_OVERRIDE = "X-HTTP-Method-Override";
-
-    public static final String APPLICATION_MERGE_PATCH_JSON = "application/merge-patch+json";
-
-    public static final String SERVICE_RESOURCE_TYPE = "service-instance";
-
-    public static final String RESOURCE_LINK = "resource-link";
-
-    public static final String RESOURCE_TYPE = "resource-type";
-
-    public static final String GENERIC_VNF_VNF_NAME = "generic-vnf.vnf-name";
-
-    public static final String GENERIC_VNF_VNF_ID = "generic-vnf.vnf-id";
-
-    public static final String SERVICE_INSTANCE_SERVICE_INSTANCE_ID = "service-instance.service-instance-id";
-
-    public static final String SERVICE_SUBSCRIPTION_SERVICE_TYPE = "service-subscription.service-type";
-
-    public static final String CUSTOMER_GLOBAL_CUSTOMER_ID = "customer.global-customer-id";
-
-    public static final String COMPOSED_OF = "org.onap.relationships.inventory.ComposedOf";
-
-    public static final String GENERIC_VNF = "generic-vnf";
-
-    public static final String PNF = "pnf";
-
-    public static final String PLATFORM = "platform";
-
-    public static final String USES = "org.onap.relationships.inventory.Uses";
-
-    public static final String PLATFORM_PLATFORM_NAME = "platform.platform-name";
-
-    public static final String LINE_OF_BUSINESS_LINE_OF_BUSINESS_NAME = "line-of-business.line-of-business-name";
-
-    public static final String LINE_OF_BUSINESS = "line-of-business";
-
-    public static final String SERVICE_SUBSCRIPTION = "service-subscription";
-
-    public static final String CUSTOMER_TYPE = "Customer";
-
-    public static final String SERVICE_INSTANCE_SERVICE_INSTANCE_NAME = "service-instance.service-instance-name";
-
-    public static final String CLOUD_REGION_OWNER_DEFINED_TYPE = "cloud-region.owner-defined-type";
-
-    public static final String CLOUD_REGION_CLOUD_REGION_ID = "cloud-region.cloud-region-id";
-
-    public static final String CLOUD_REGION_CLOUD_OWNER = "cloud-region.cloud-owner";
-
-    public static final String LOCATED_IN = "org.onap.relationships.inventory.LocatedIn";
-
-    public static final String CLOUD_REGION = "cloud-region";
-
-    public static final String TENANT_TENANT_NAME = "tenant.tenant-name";
-
-    public static final String TENANT_TENANT_ID = "tenant.tenant-id";
-
-    public static final String BELONGS_TO = "org.onap.relationships.inventory.BelongsTo";
-
-    public static final String TENANT = "tenant";
-
-    public static final String ESR_VNFM = "esr-vnfm";
-
-    public static final String ESR_SYSTEM_INFO = "esr-system-info";
-
-    public static final String ESR_SYSTEM_INFO_LIST = "esr-system-info-list";
-
-    public static final String ESR_VNFM_VNFM_ID = "esr-vnfm.vnfm-id";
-
-    public static final String DEPENDS_ON = "tosca.relationships.DependsOn";
-
-    public static final String VSERVER_VSERVER_NAME = "vserver.vserver-name";
-
-    public static final String VSERVER_VSERVER_ID = "vserver.vserver-id";
-
-    public static final String HOSTED_ON = "tosca.relationships.HostedOn";
-
-    public static final String VSERVER = "vserver";
-
-    private Constants() {}
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/HttpServiceUtils.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/HttpServiceUtils.java
deleted file mode 100755
index 81781025..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/HttpServiceUtils.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.utils;
-
-import static org.onap.so.aaisimulator.utils.Constants.BI_DIRECTIONAL_RELATIONSHIP_LIST_URL;
-import static org.onap.so.aaisimulator.utils.Constants.RELATIONSHIP_LIST_RELATIONSHIP_URL;
-import static org.springframework.http.MediaType.APPLICATION_XML;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.web.util.UriComponentsBuilder;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public class HttpServiceUtils {
-
-    private static final String START_WITH_FORWARD_SLASH = "(^/.*?)";
-    private static final String ALPHANUMERIC = "((?:v+[a-z0-9]*)/)";
-    private static final String REGEX = START_WITH_FORWARD_SLASH + ALPHANUMERIC;
-    private static final Pattern PATTERN = Pattern.compile(REGEX, Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
-
-    private HttpServiceUtils() {}
-
-    public static URI getBaseUrl(final HttpServletRequest request) {
-        final StringBuffer url = request.getRequestURL();
-        final String uri = request.getRequestURI();
-        return UriComponentsBuilder.fromHttpUrl(url.substring(0, url.indexOf(uri))).path(getBaseUrl(uri)).build()
-                .toUri();
-    }
-
-    private static String getBaseUrl(final String uri) {
-        final Matcher matcher = PATTERN.matcher(uri);
-        if (matcher.find()) {
-            final StringBuilder builder = new StringBuilder();
-            for (int index = 0; index < matcher.groupCount() - 1; index++) {
-                builder.append(matcher.group(index));
-            }
-            return builder.toString();
-        }
-        return uri;
-    }
-
-    public static URI getBaseUrl(final StringBuffer requestUrl, final String requestUri) {
-        return UriComponentsBuilder.fromHttpUrl(requestUrl.substring(0, requestUrl.indexOf(requestUri))).build()
-                .toUri();
-    }
-
-    public static String getBaseServiceInstanceUrl(final HttpServletRequest request, final String relatedLink) {
-        return UriComponentsBuilder.fromUri(getBaseUrl(request)).path(relatedLink).toUriString();
-    }
-
-    public static HttpHeaders getHeaders(final HttpServletRequest request) {
-        return getHeaders(request, APPLICATION_XML);
-    }
-
-    public static HttpHeaders getHeaders(final HttpServletRequest request, final MediaType mediaType) {
-        final HttpHeaders headers = new HttpHeaders();
-        for (final Enumeration<String> enumeration = request.getHeaderNames(); enumeration.hasMoreElements();) {
-            final String headerName = enumeration.nextElement();
-            headers.add(headerName, request.getHeader(headerName));
-        }
-        headers.setContentType(mediaType);
-        headers.setAccept(Arrays.asList(MediaType.APPLICATION_XML));
-        return headers;
-    }
-
-    public static String getTargetUrl(final String targetBaseUrl, final String relatedLink) {
-        return UriComponentsBuilder.fromUriString(targetBaseUrl).path(relatedLink)
-                .path(BI_DIRECTIONAL_RELATIONSHIP_LIST_URL).toUriString();
-    }
-
-    public static String getRelationShipListRelatedLink(final String requestUriString) {
-        return requestUriString != null ? requestUriString.replaceFirst(RELATIONSHIP_LIST_RELATIONSHIP_URL, "")
-                : requestUriString;
-    }
-
-    public static String getBiDirectionalRelationShipListRelatedLink(final String requestUriString) {
-        return requestUriString != null ? requestUriString.replaceFirst(BI_DIRECTIONAL_RELATIONSHIP_LIST_URL, "")
-                : requestUriString;
-    }
-
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestError.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestError.java
deleted file mode 100755
index 782625f7..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestError.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.utils;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@XmlRootElement(name = "requestError")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class RequestError {
-
-    @XmlElement(name = "serviceException")
-    private ServiceException serviceException;
-
-    /**
-     * @return the serviceException
-     */
-    public ServiceException getServiceException() {
-        return serviceException;
-    }
-
-    /**
-     * @param serviceException the serviceException to set
-     */
-    public void setServiceException(final ServiceException serviceException) {
-        this.serviceException = serviceException;
-    }
-
-    @Override
-    public String toString() {
-        return "RequestError [serviceException=" + serviceException + "]";
-    }
-
-
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorBuilder.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorBuilder.java
deleted file mode 100755
index f3742220..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorBuilder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.utils;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public class RequestErrorBuilder {
-
-    private final ServiceException serviceException = new ServiceException();
-
-    public RequestErrorBuilder messageId(final String messageId) {
-        this.serviceException.setMessageId(messageId);
-        return this;
-    }
-
-    public RequestErrorBuilder text(final String text) {
-        this.serviceException.setText(text);
-        return this;
-    }
-
-    public RequestErrorBuilder variables(final List<String> variables) {
-        this.serviceException.setVariables(variables);
-        return this;
-    }
-
-    public RequestErrorBuilder variables(final String... variables) {
-        this.serviceException.setVariables(Arrays.asList(variables));
-        return this;
-    }
-
-    public RequestError build() {
-        final RequestError requestError = new RequestError();
-        requestError.setServiceException(serviceException);
-        return requestError;
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorResponseUtils.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorResponseUtils.java
deleted file mode 100755
index 755d3a70..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorResponseUtils.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.utils;
-
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public class RequestErrorResponseUtils {
-
-    public static final String ERROR_MESSAGE_ID = "SVC3001";
-
-    public static final String ERROR_MESSAGE = "Resource not found for %1 using id %2 (msg=%3) (ec=%4)";
-
-    private static final String EMPTY_STRING = "";
-
-    public static final String getResourceVersion() {
-        return System.currentTimeMillis() + EMPTY_STRING;
-    }
-
-    public static ResponseEntity<?> getRequestErrorResponseEntity(final HttpServletRequest request,
-            final String nodeType) {
-        return new ResponseEntity<>(new RequestErrorBuilder().messageId(ERROR_MESSAGE_ID).text(ERROR_MESSAGE)
-                .variables(request.getMethod(), request.getRequestURI(),
-                        "Node Not Found:No Node of " + nodeType + " found at: " + request.getRequestURI(),
-                        "ERR.5.4.6114")
-                .build(), HttpStatus.NOT_FOUND);
-    }
-
-    public static ResponseEntity<?> getRequestErrorResponseEntity(final HttpServletRequest request) {
-        return getRequestErrorResponseEntity(request, Constants.SERVICE_RESOURCE_TYPE);
-    }
-
-    private RequestErrorResponseUtils() {}
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ServiceException.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ServiceException.java
deleted file mode 100755
index 7ba47fa7..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ServiceException.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.utils;
-
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@XmlRootElement(name = "serviceException")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ServiceException {
-
-    private String messageId;
-
-    private String text;
-
-    private List<String> variables;
-
-    /**
-     * @return the messageId
-     */
-    public String getMessageId() {
-        return messageId;
-    }
-
-    /**
-     * @param messageId the messageId to set
-     */
-    public void setMessageId(final String messageId) {
-        this.messageId = messageId;
-    }
-
-    /**
-     * @return the text
-     */
-    public String getText() {
-        return text;
-    }
-
-    /**
-     * @param text the text to set
-     */
-    public void setText(final String text) {
-        this.text = text;
-    }
-
-    /**
-     * @return the variables
-     */
-    public List<String> getVariables() {
-        return variables;
-    }
-
-    /**
-     * @param variables the variables to set
-     */
-    public void setVariables(final List<String> variables) {
-        this.variables = variables;
-    }
-
-    @Override
-    public String toString() {
-        return "ServiceException [messageId=" + messageId + ", text=" + text + ", variables=" + variables + "]";
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ShallowBeanCopy.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ShallowBeanCopy.java
deleted file mode 100755
index 3285e013..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ShallowBeanCopy.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.utils;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public class ShallowBeanCopy {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ShallowBeanCopy.class);
-
-    private ShallowBeanCopy() {}
-
-    public static void copy(final Object from, final Object to) throws Exception {
-        final Map<String, Method> fromMethods = getMethods(from);
-        final Map<String, Method> toMethods = getMethods(to);
-
-        for (final Entry<String, Method> entry : fromMethods.entrySet()) {
-            final String methodName = entry.getKey();
-            final Method fromMethod = entry.getValue();
-
-            final Optional<Method> optional = getSetMethod(to, fromMethod);
-            if (optional.isPresent()) {
-                final Method toGetMethod = toMethods.get(methodName);
-                final Method toMethod = optional.get();
-                final Object toValue = fromMethod.invoke(from);
-
-                final Object fromValue = toGetMethod.invoke(to);
-                if (toValue != null && !toValue.equals(fromValue)) {
-                    LOGGER.info("Changing {} value from: {} to: {}", methodName, fromValue, toValue);
-                    toMethod.invoke(to, toValue);
-                }
-            }
-        }
-    }
-
-
-    private static Optional<Method> getSetMethod(final Object to, final Method fromMethod) {
-        final String name = fromMethod.getName().replaceFirst("get|is", "set");
-        final Class<?> returnType = fromMethod.getReturnType();
-        try {
-            return Optional.of(to.getClass().getMethod(name, returnType));
-        } catch (final NoSuchMethodException noSuchMethodException) {
-        }
-        return Optional.empty();
-    }
-
-    private static Map<String, Method> getMethods(final Object object) {
-        final Map<String, Method> methodsFound = new HashMap<>();
-        final Method[] methods = object.getClass().getMethods();
-
-        for (final Method method : methods) {
-            if (method.getName().startsWith("get") || method.getName().startsWith("is")) {
-                final String name = method.getName().replaceFirst("get|is", "");
-
-                methodsFound.put(name, method);
-            }
-        }
-
-        return methodsFound;
-
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/application.yaml b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/application.yaml
deleted file mode 100755
index 205abe40..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/application.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-server:
-   port: 9993
-   tomcat:
-      max-threads: 4
-   ssl:
-      key-store: classpath:keystore/org.onap.so.p12
-      key-store-password: u!@JQoYD])@ykq.NKM,O7iA.
-      keyStoreType: PKCS12
-ssl-enable: true
-spring:
-   security:
-      users:
-      -  username: aai
-         #password: aai.onap.org:demo123456!
-         password: $2a$04$crRntT01fAF4kb48mxlvgu68/silcLg.czC1LxQsKTdWuDBPpO3YO
-         role: VID
-      -  username: aai@aai.onap.org
-         #password: demo123456!
-         password: $2a$04$06VCpDvW5ztE7WOvhhvAtOx7JHLghECyZIzOShIbXLWpnshMva8T6
-         role: VID
-http:
-   client:
-      ssl:
-         trust-store: classpath:truststore/org.onap.so.trust.jks
-         trust-store-password: '[)3KV.k*!IlkFhWEq0Nv2dDa'
\ No newline at end of file
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/keystore/org.onap.so.p12 b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/keystore/org.onap.so.p12
deleted file mode 100755
index 015f2bf6..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/keystore/org.onap.so.p12
+++ /dev/null
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/truststore/org.onap.so.trust.jks b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/truststore/org.onap.so.trust.jks
deleted file mode 100755
index 88d61846..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/truststore/org.onap.so.trust.jks
+++ /dev/null
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AaiSimulatorControllerTest.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AaiSimulatorControllerTest.java
deleted file mode 100755
index 4fe5c403..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AaiSimulatorControllerTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.so.aaisimulator.utils.Constants;
-import org.onap.so.aaisimulator.utils.TestConstants;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ActiveProfiles("test")
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-@Configuration
-public class AaiSimulatorControllerTest {
-
-    @LocalServerPort
-    private int port;
-
-    @Autowired
-    private TestRestTemplate restTemplate;
-
-    @Test
-    public void test_healthCheck_matchContent() {
-        final String url = getBaseUrl() + "/healthcheck";
-        final ResponseEntity<String> object = restTemplate.getForEntity(url, String.class);
-
-        assertEquals(Constants.HEALTHY, object.getBody());
-    }
-
-    private String getBaseUrl() {
-        return "https://localhost:" + port + TestConstants.BASE_URL_V17;
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AbstractSpringBootTest.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AbstractSpringBootTest.java
deleted file mode 100755
index 84bb8cab..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AbstractSpringBootTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import java.util.List;
-import org.junit.runner.RunWith;
-import org.onap.aai.domain.yang.RelatedToProperty;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.so.aaisimulator.utils.TestRestTemplateService;
-import org.onap.so.aaisimulator.utils.TestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ActiveProfiles("test")
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-@Configuration
-public abstract class AbstractSpringBootTest {
-
-    @LocalServerPort
-    private int port;
-
-    @Autowired
-    protected TestRestTemplateService testRestTemplateService;
-
-    public String getUrl(final String... urls) {
-        return TestUtils.getUrl(port, urls);
-    }
-
-    public RelationshipData getRelationshipData(final List<RelationshipData> relationshipData, final String key) {
-        return relationshipData.stream().filter(data -> data.getRelationshipKey().equals(key)).findFirst().orElse(null);
-    }
-
-    public RelatedToProperty getRelatedToProperty(final List<RelatedToProperty> relatedToPropertyList,
-            final String key) {
-        return relatedToPropertyList.stream().filter(data -> data.getPropertyKey().equals(key)).findFirst()
-                .orElse(null);
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/BusinessControllerTest.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/BusinessControllerTest.java
deleted file mode 100755
index c08c51ec..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/BusinessControllerTest.java
+++ /dev/null
@@ -1,397 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.onap.so.aaisimulator.utils.Constants.BI_DIRECTIONAL_RELATIONSHIP_LIST_URL;
-import static org.onap.so.aaisimulator.utils.Constants.X_HTTP_METHOD_OVERRIDE;
-import static org.onap.so.aaisimulator.utils.TestConstants.CUSTOMERS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.GENERIC_VNF_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.GENERIC_VNF_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.GLOBAL_CUSTOMER_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.RELATED_TO_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_INSTANCES_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_INSTANCE_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_INSTANCE_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_SUBSCRIPTIONS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_TYPE;
-import static org.onap.so.aaisimulator.utils.TestConstants.VNF_ID;
-import static org.onap.so.aaisimulator.utils.TestUtils.getCustomer;
-import static org.onap.so.aaisimulator.utils.TestUtils.getServiceInstance;
-import java.io.IOException;
-import java.util.Optional;
-import java.util.UUID;
-import org.junit.After;
-import org.junit.Test;
-import org.onap.aai.domain.yang.Customer;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.GenericVnfs;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.ServiceInstance;
-import org.onap.aai.domain.yang.ServiceInstances;
-import org.onap.aai.domain.yang.ServiceSubscription;
-import org.onap.so.aaisimulator.service.providers.CustomerCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.RequestError;
-import org.onap.so.aaisimulator.utils.RequestErrorResponseUtils;
-import org.onap.so.aaisimulator.utils.ServiceException;
-import org.onap.so.aaisimulator.utils.TestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public class BusinessControllerTest extends AbstractSpringBootTest {
-
-    private static final String FIREWALL_SERVICE_TYPE = "Firewall";
-
-    private static final String ORCHESTRATION_STATUS = "Active";
-
-    @Autowired
-    private CustomerCacheServiceProvider cacheServiceProvider;
-
-    @After
-    public void after() {
-        cacheServiceProvider.clearAll();
-    }
-
-    @Test
-    public void test_putCustomer_successfullyAddedToCache() throws Exception {
-        invokeCustomerEndPointAndAssertResponse();
-        assertTrue(cacheServiceProvider.getCustomer(GLOBAL_CUSTOMER_ID).isPresent());
-    }
-
-    @Test
-    public void test_getCustomer_ableToRetrieveCustomer() throws Exception {
-        final String url = getUrl(CUSTOMERS_URL);
-
-        final ResponseEntity<Void> response = testRestTemplateService.invokeHttpPut(url, getCustomer(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
-
-        final ResponseEntity<Customer> actual = testRestTemplateService.invokeHttpGet(url, Customer.class);
-
-        assertEquals(HttpStatus.OK, actual.getStatusCode());
-        assertTrue(actual.hasBody());
-
-        final Customer actualCustomer = actual.getBody();
-        assertEquals(GLOBAL_CUSTOMER_ID, actualCustomer.getGlobalCustomerId());
-        assertNotNull(actualCustomer.getResourceVersion());
-        assertFalse(actualCustomer.getResourceVersion().isEmpty());
-    }
-
-    @Test
-    public void test_getCustomer_returnRequestError_ifCustomerNotInCache() throws Exception {
-        final String url = getUrl(CUSTOMERS_URL);
-
-        final ResponseEntity<RequestError> actual = testRestTemplateService.invokeHttpGet(url, RequestError.class);
-
-        assertEquals(HttpStatus.NOT_FOUND, actual.getStatusCode());
-
-        final RequestError actualError = actual.getBody();
-        final ServiceException serviceException = actualError.getServiceException();
-
-        assertNotNull(serviceException);
-        assertEquals(RequestErrorResponseUtils.ERROR_MESSAGE_ID, serviceException.getMessageId());
-        assertEquals(RequestErrorResponseUtils.ERROR_MESSAGE, serviceException.getText());
-        assertTrue(serviceException.getVariables().contains(HttpMethod.GET.toString()));
-
-    }
-
-    @Test
-    public void test_getServiceSubscription_ableToRetrieveServiceSubscriptionFromCache() throws Exception {
-        final String url = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL);
-
-        invokeCustomerEndPointAndAssertResponse();
-
-        final ResponseEntity<ServiceSubscription> actual =
-                testRestTemplateService.invokeHttpGet(url, ServiceSubscription.class);
-
-        assertEquals(HttpStatus.OK, actual.getStatusCode());
-        assertTrue(actual.hasBody());
-
-        final ServiceSubscription actualServiceSubscription = actual.getBody();
-        assertEquals(SERVICE_TYPE, actualServiceSubscription.getServiceType());
-        assertNotNull(actualServiceSubscription.getRelationshipList());
-        assertFalse(actualServiceSubscription.getRelationshipList().getRelationship().isEmpty());
-    }
-
-    @Test
-    public void test_putSericeInstance_ableToRetrieveServiceInstanceFromCache() throws Exception {
-
-        invokeCustomerEndPointAndAssertResponse();
-        invokeServiceInstanceEndPointAndAssertResponse();
-
-
-        final Optional<ServiceInstance> actual =
-                cacheServiceProvider.getServiceInstance(GLOBAL_CUSTOMER_ID, SERVICE_TYPE, SERVICE_INSTANCE_ID);
-
-        assertTrue(actual.isPresent());
-        final ServiceInstance actualServiceInstance = actual.get();
-
-        assertEquals(SERVICE_INSTANCE_ID, actualServiceInstance.getServiceInstanceId());
-        assertEquals(SERVICE_NAME, actualServiceInstance.getServiceInstanceName());
-
-    }
-
-    @Test
-    public void test_getSericeInstance_usingServiceInstanceName_ableToRetrieveServiceInstanceFromCache()
-            throws Exception {
-
-        invokeCustomerEndPointAndAssertResponse();
-        invokeServiceInstanceEndPointAndAssertResponse();
-
-
-        final String serviceInstanceUrl = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCES_URL)
-                + "?depth=2&service-instance-name=" + SERVICE_NAME;
-
-        final ResponseEntity<ServiceInstances> actual =
-                testRestTemplateService.invokeHttpGet(serviceInstanceUrl, ServiceInstances.class);
-
-        assertEquals(HttpStatus.OK, actual.getStatusCode());
-        assertTrue(actual.hasBody());
-
-        final ServiceInstances actualServiceInstances = actual.getBody();
-        assertFalse(actualServiceInstances.getServiceInstance().isEmpty());
-
-        assertEquals(SERVICE_NAME, actualServiceInstances.getServiceInstance().get(0).getServiceInstanceName());
-
-    }
-
-    @Test
-    public void test_getSericeInstance_usingServiceInstanceName_returnRequestErrorIfnoServiceInstanceFound()
-            throws Exception {
-
-        invokeCustomerEndPointAndAssertResponse();
-
-        final String serviceInstanceUrl = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCES_URL)
-                + "?depth=2&service-instance-name=" + SERVICE_NAME;
-
-        final ResponseEntity<RequestError> actual =
-                testRestTemplateService.invokeHttpGet(serviceInstanceUrl, RequestError.class);
-
-        assertEquals(HttpStatus.NOT_FOUND, actual.getStatusCode());
-        assertTrue(actual.hasBody());
-
-        assertNotNull(actual.getBody().getServiceException());
-
-    }
-
-    @Test
-    public void test_getSericeInstance_usingServiceInstanceId_ableToRetrieveServiceInstanceFromCache()
-            throws Exception {
-
-        final String url = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
-
-        invokeCustomerEndPointAndAssertResponse();
-        invokeServiceInstanceEndPointAndAssertResponse();
-
-        final ResponseEntity<ServiceInstance> actual =
-                testRestTemplateService.invokeHttpGet(url, ServiceInstance.class);
-
-        assertEquals(HttpStatus.OK, actual.getStatusCode());
-        assertTrue(actual.hasBody());
-
-        final ServiceInstance actualServiceInstance = actual.getBody();
-
-        assertEquals(SERVICE_NAME, actualServiceInstance.getServiceInstanceName());
-        assertEquals(SERVICE_INSTANCE_ID, actualServiceInstance.getServiceInstanceId());
-
-    }
-
-    @Test
-    public void test_getSericeInstance_usinginvalidServiceInstanceId_shouldReturnError() throws Exception {
-
-        invokeCustomerEndPointAndAssertResponse();
-
-        invokeServiceInstanceEndPointAndAssertResponse();
-
-
-        final String invalidServiceInstanceUrl = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL,
-                SERVICE_INSTANCES_URL + "/service-instance/" + UUID.randomUUID());
-
-        final ResponseEntity<RequestError> actual =
-                testRestTemplateService.invokeHttpGet(invalidServiceInstanceUrl, RequestError.class);
-
-        assertEquals(HttpStatus.NOT_FOUND, actual.getStatusCode());
-
-        final RequestError actualError = actual.getBody();
-        final ServiceException serviceException = actualError.getServiceException();
-
-        assertNotNull(serviceException);
-        assertEquals(RequestErrorResponseUtils.ERROR_MESSAGE_ID, serviceException.getMessageId());
-        assertEquals(RequestErrorResponseUtils.ERROR_MESSAGE, serviceException.getText());
-        assertTrue(serviceException.getVariables().contains(HttpMethod.GET.toString()));
-
-    }
-
-    @Test
-    public void test_getSericeInstance_usingInvalidServiceInstanceName_shouldReturnError() throws Exception {
-
-        invokeCustomerEndPointAndAssertResponse();
-        invokeServiceInstanceEndPointAndAssertResponse();
-
-
-        final String serviceInstanceUrl = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCES_URL)
-                + "?service-instance-name=Dummy&depth=2";
-
-        final ResponseEntity<RequestError> actual =
-                testRestTemplateService.invokeHttpGet(serviceInstanceUrl, RequestError.class);
-
-        assertEquals(HttpStatus.NOT_FOUND, actual.getStatusCode());
-
-        final RequestError actualError = actual.getBody();
-        final ServiceException serviceException = actualError.getServiceException();
-
-        assertNotNull(serviceException);
-        assertEquals(RequestErrorResponseUtils.ERROR_MESSAGE_ID, serviceException.getMessageId());
-        assertEquals(RequestErrorResponseUtils.ERROR_MESSAGE, serviceException.getText());
-        assertTrue(serviceException.getVariables().contains(HttpMethod.GET.toString()));
-
-    }
-
-    @Test
-    public void test_PathSericeInstance_usingServiceInstanceId_OrchStatusChangedInCache() throws Exception {
-
-        final String url = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
-
-        invokeCustomerEndPointAndAssertResponse();
-        invokeServiceInstanceEndPointAndAssertResponse();
-
-        final HttpHeaders httpHeaders = testRestTemplateService.getHttpHeaders();
-        httpHeaders.add(X_HTTP_METHOD_OVERRIDE, HttpMethod.PATCH.toString());
-
-        final ResponseEntity<Void> orchStatuUpdateServiceInstanceResponse = testRestTemplateService
-                .invokeHttpPost(httpHeaders, url, TestUtils.getOrchStatuUpdateServiceInstance(), Void.class);
-
-        assertEquals(HttpStatus.ACCEPTED, orchStatuUpdateServiceInstanceResponse.getStatusCode());
-
-        final ResponseEntity<ServiceInstance> actual =
-                testRestTemplateService.invokeHttpGet(url, ServiceInstance.class);
-
-        assertEquals(HttpStatus.OK, actual.getStatusCode());
-        assertTrue(actual.hasBody());
-
-        final ServiceInstance actualServiceInstance = actual.getBody();
-
-        assertEquals(SERVICE_NAME, actualServiceInstance.getServiceInstanceName());
-        assertEquals(SERVICE_INSTANCE_ID, actualServiceInstance.getServiceInstanceId());
-        assertEquals(ORCHESTRATION_STATUS, actualServiceInstance.getOrchestrationStatus());
-
-    }
-
-    @Test
-    public void test_putServiceSubscription_successfullyAddedToCache() throws Exception {
-        final String serviceSubscriptionurl =
-                getUrl(CUSTOMERS_URL, "/service-subscriptions/service-subscription/", FIREWALL_SERVICE_TYPE);
-
-        invokeCustomerEndPointAndAssertResponse();
-
-        final ResponseEntity<Void> responseEntity = testRestTemplateService.invokeHttpPut(serviceSubscriptionurl,
-                TestUtils.getServiceSubscription(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, responseEntity.getStatusCode());
-
-        final ResponseEntity<ServiceSubscription> actual =
-                testRestTemplateService.invokeHttpGet(serviceSubscriptionurl, ServiceSubscription.class);
-
-        assertEquals(HttpStatus.OK, actual.getStatusCode());
-        assertTrue(actual.hasBody());
-
-        final ServiceSubscription actualServiceSubscription = actual.getBody();
-        assertEquals(FIREWALL_SERVICE_TYPE, actualServiceSubscription.getServiceType());
-
-    }
-
-    @Test
-    public void test_putSericeInstanceRelatedTo_ableToRetrieveServiceInstanceFromCache() throws Exception {
-
-        final String url = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
-
-        invokeCustomerEndPointAndAssertResponse();
-
-        invokeServiceInstanceEndPointAndAssertResponse();
-
-        final String relationShipUrl = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL,
-                BI_DIRECTIONAL_RELATIONSHIP_LIST_URL);
-
-        final ResponseEntity<Relationship> responseEntity2 = testRestTemplateService.invokeHttpPut(relationShipUrl,
-                TestUtils.getRelationShipJsonObject(), Relationship.class);
-
-        assertEquals(HttpStatus.ACCEPTED, responseEntity2.getStatusCode());
-
-        final String genericVnfUrl = getUrl(GENERIC_VNF_URL, VNF_ID);
-        final ResponseEntity<Void> genericVnfResponse =
-                testRestTemplateService.invokeHttpPut(genericVnfUrl, TestUtils.getGenericVnf(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, genericVnfResponse.getStatusCode());
-
-        final ResponseEntity<GenericVnfs> actual = testRestTemplateService
-                .invokeHttpGet(url + RELATED_TO_URL + "?vnf-name=" + GENERIC_VNF_NAME, GenericVnfs.class);
-
-        assertEquals(HttpStatus.OK, actual.getStatusCode());
-
-        assertTrue(actual.hasBody());
-        final GenericVnfs genericVnfs = actual.getBody();
-        assertFalse(genericVnfs.getGenericVnf().isEmpty());
-        final GenericVnf genericVnf = genericVnfs.getGenericVnf().get(0);
-        assertEquals(GENERIC_VNF_NAME, genericVnf.getVnfName());
-    }
-
-    @Test
-    public void test_DeleteSericeInstance_ServiceInstanceRemovedFromCache() throws Exception {
-        final String url = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
-
-        invokeCustomerEndPointAndAssertResponse();
-
-        invokeServiceInstanceEndPointAndAssertResponse();
-
-        final Optional<ServiceInstance> optional =
-                cacheServiceProvider.getServiceInstance(GLOBAL_CUSTOMER_ID, SERVICE_TYPE, SERVICE_INSTANCE_ID);
-        assertTrue(optional.isPresent());
-        final ServiceInstance serviceInstance = optional.get();
-
-        final ResponseEntity<Void> responseEntity = testRestTemplateService
-                .invokeHttpDelete(url + "?resource-version=" + serviceInstance.getResourceVersion(), Void.class);
-        assertEquals(HttpStatus.NO_CONTENT, responseEntity.getStatusCode());
-        assertFalse(cacheServiceProvider.getServiceInstance(GLOBAL_CUSTOMER_ID, SERVICE_TYPE, SERVICE_INSTANCE_ID)
-                .isPresent());
-    }
-
-    private void invokeServiceInstanceEndPointAndAssertResponse() throws IOException {
-        final String url = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
-        final ResponseEntity<Void> responseEntity =
-                testRestTemplateService.invokeHttpPut(url, getServiceInstance(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, responseEntity.getStatusCode());
-    }
-
-    private void invokeCustomerEndPointAndAssertResponse() throws Exception, IOException {
-        final ResponseEntity<Void> response =
-                testRestTemplateService.invokeHttpPut(getUrl(CUSTOMERS_URL), getCustomer(), Void.class);
-
-        assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/CloudRegionsControllerTest.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/CloudRegionsControllerTest.java
deleted file mode 100755
index 1b967596..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/CloudRegionsControllerTest.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.onap.so.aaisimulator.utils.Constants.BI_DIRECTIONAL_RELATIONSHIP_LIST_URL;
-import static org.onap.so.aaisimulator.utils.Constants.RELATIONSHIP_LIST_RELATIONSHIP_URL;
-import static org.onap.so.aaisimulator.utils.Constants.VSERVER;
-import static org.onap.so.aaisimulator.utils.TestConstants.CLOUD_OWNER_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.CLOUD_REGION_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.CUSTOMERS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_PASSWORD;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_SERVICE_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_SYSTEM_INFO_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_SYSTEM_INFO_LIST_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_SYSTEM_TYPE;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_TYEP;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_USERNAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_VENDOR;
-import static org.onap.so.aaisimulator.utils.TestConstants.GENERIC_VNF_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.GENERIC_VNF_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_INSTANCE_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_SUBSCRIPTIONS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SYSTEM_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.TENANTS_TENANT;
-import static org.onap.so.aaisimulator.utils.TestConstants.TENANT_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.VNF_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.VSERVER_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.VSERVER_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.VSERVER_URL;
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-import org.junit.After;
-import org.junit.Test;
-import org.onap.aai.domain.yang.CloudRegion;
-import org.onap.aai.domain.yang.EsrSystemInfo;
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.RelatedToProperty;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.RelationshipList;
-import org.onap.aai.domain.yang.Tenant;
-import org.onap.aai.domain.yang.Vserver;
-import org.onap.so.aaisimulator.models.CloudRegionKey;
-import org.onap.so.aaisimulator.service.providers.CloudRegionCacheServiceProvider;
-import org.onap.so.aaisimulator.service.providers.CustomerCacheServiceProvider;
-import org.onap.so.aaisimulator.service.providers.GenericVnfCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.Constants;
-import org.onap.so.aaisimulator.utils.TestConstants;
-import org.onap.so.aaisimulator.utils.TestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public class CloudRegionsControllerTest extends AbstractSpringBootTest {
-
-    private static final CloudRegionKey CLOUD_REGION_KEY = new CloudRegionKey(CLOUD_OWNER_NAME, CLOUD_REGION_NAME);
-
-    @Autowired
-    private CloudRegionCacheServiceProvider cloudRegionCacheServiceProvider;
-
-    @Autowired
-    private CustomerCacheServiceProvider customerCacheServiceProvider;
-
-    @Autowired
-    private GenericVnfCacheServiceProvider genericVnfCacheServiceProvider;
-
-    @After
-    public void after() {
-        cloudRegionCacheServiceProvider.clearAll();
-        customerCacheServiceProvider.clearAll();
-        genericVnfCacheServiceProvider.clearAll();
-    }
-
-    @Test
-    public void test_putCloudRegion_successfullyAddedToCache() throws Exception {
-        final String url = getUrl(TestConstants.CLOUD_REGIONS, CLOUD_OWNER_NAME, "/" + CLOUD_REGION_NAME);
-
-        invokeCloudRegionHttpPutEndPointAndAssertResponse(url);
-
-        final ResponseEntity<CloudRegion> response = testRestTemplateService.invokeHttpGet(url, CloudRegion.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-
-        final CloudRegion cloudRegion = response.getBody();
-        assertEquals(CLOUD_OWNER_NAME, cloudRegion.getCloudOwner());
-        assertEquals(CLOUD_REGION_NAME, cloudRegion.getCloudRegionId());
-
-        assertNotNull("ResourceVersion should not be null", cloudRegion.getResourceVersion());
-
-    }
-
-    @Test
-    public void test_getCloudRegionWithDepthValue_shouldReturnMatchedCloudRegion() throws Exception {
-        final String url = getUrl(TestConstants.CLOUD_REGIONS, CLOUD_OWNER_NAME, "/" + CLOUD_REGION_NAME);
-
-        invokeCloudRegionHttpPutEndPointAndAssertResponse(url);
-
-        final ResponseEntity<CloudRegion> response =
-                testRestTemplateService.invokeHttpGet(url + "?depth=2", CloudRegion.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-
-        final CloudRegion cloudRegion = response.getBody();
-        assertEquals(CLOUD_OWNER_NAME, cloudRegion.getCloudOwner());
-        assertEquals(CLOUD_REGION_NAME, cloudRegion.getCloudRegionId());
-
-        assertNotNull("ResourceVersion should not be null", cloudRegion.getResourceVersion());
-
-    }
-
-    @Test
-    public void test_putGenericVnfRelationShipToPlatform_successfullyAddedToCache() throws Exception {
-
-        final String url = getUrl(TestConstants.CLOUD_REGIONS, CLOUD_OWNER_NAME, "/" + CLOUD_REGION_NAME);
-
-        invokeCloudRegionHttpPutEndPointAndAssertResponse(url);
-
-        final String relationShipUrl = getUrl(TestConstants.CLOUD_REGIONS, CLOUD_OWNER_NAME, "/" + CLOUD_REGION_NAME,
-                BI_DIRECTIONAL_RELATIONSHIP_LIST_URL);
-
-        final ResponseEntity<Relationship> responseEntity = testRestTemplateService.invokeHttpPut(relationShipUrl,
-                TestUtils.getGenericVnfRelationShip(), Relationship.class);
-        assertEquals(HttpStatus.ACCEPTED, responseEntity.getStatusCode());
-
-        final Optional<CloudRegion> optional = cloudRegionCacheServiceProvider.getCloudRegion(CLOUD_REGION_KEY);
-        assertTrue(optional.isPresent());
-
-        final CloudRegion actual = optional.get();
-
-        assertNotNull(actual.getRelationshipList());
-        final List<Relationship> relationshipList = actual.getRelationshipList().getRelationship();
-        assertFalse("Relationship list should not be empty", relationshipList.isEmpty());
-        final Relationship relationship = relationshipList.get(0);
-
-        assertEquals(GENERIC_VNF_URL + VNF_ID, relationship.getRelatedLink());
-
-        assertFalse("RelationshipData list should not be empty", relationship.getRelationshipData().isEmpty());
-        assertFalse("RelatedToProperty list should not be empty", relationship.getRelatedToProperty().isEmpty());
-
-        final RelationshipData relationshipData = relationship.getRelationshipData().get(0);
-        assertEquals(Constants.GENERIC_VNF_VNF_ID, relationshipData.getRelationshipKey());
-        assertEquals(TestConstants.VNF_ID, relationshipData.getRelationshipValue());
-
-        final RelatedToProperty relatedToProperty = relationship.getRelatedToProperty().get(0);
-        assertEquals(Constants.GENERIC_VNF_VNF_NAME, relatedToProperty.getPropertyKey());
-        assertEquals(TestConstants.GENERIC_VNF_NAME, relatedToProperty.getPropertyValue());
-
-    }
-
-    @Test
-    public void test_putTenant_successfullyAddedToCache() throws Exception {
-        final String cloudRegionUrl = getUrl(TestConstants.CLOUD_REGIONS, CLOUD_OWNER_NAME, "/" + CLOUD_REGION_NAME);
-
-        invokeCloudRegionHttpPutEndPointAndAssertResponse(cloudRegionUrl);
-
-        final String tenantUrl = getUrl(TestConstants.CLOUD_REGIONS, CLOUD_OWNER_NAME,
-                "/" + CLOUD_REGION_NAME + TENANTS_TENANT + TENANT_ID);
-        addTenantAndAssertResponse(tenantUrl);
-
-        final ResponseEntity<Tenant> response = testRestTemplateService.invokeHttpGet(tenantUrl, Tenant.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-
-        final Tenant tenant = response.getBody();
-        assertEquals(TENANT_ID, tenant.getTenantId());
-        assertEquals("admin", tenant.getTenantName());
-
-        assertNotNull("ResourceVersion should not be null", tenant.getResourceVersion());
-
-    }
-
-    @Test
-    public void test_putTenantRelationToGenericVnf_successfullyAddedToCache() throws Exception {
-
-        addCustomerServiceAndGenericVnf();
-
-        final String cloudRegionUrl = getUrl(TestConstants.CLOUD_REGIONS, CLOUD_OWNER_NAME, "/" + CLOUD_REGION_NAME);
-        invokeCloudRegionHttpPutEndPointAndAssertResponse(cloudRegionUrl);
-
-        final String tenantUrl = getUrl(TestConstants.CLOUD_REGIONS, CLOUD_OWNER_NAME, "/" + CLOUD_REGION_NAME,
-                TENANTS_TENANT + TENANT_ID);
-        addTenantAndAssertResponse(tenantUrl);
-
-        final String tenantRelationShipUrl = getUrl(TestConstants.CLOUD_REGIONS, CLOUD_OWNER_NAME,
-                "/" + CLOUD_REGION_NAME, TENANTS_TENANT + TENANT_ID, RELATIONSHIP_LIST_RELATIONSHIP_URL);
-
-        final ResponseEntity<Void> tenantRelationShipResponse = testRestTemplateService
-                .invokeHttpPut(tenantRelationShipUrl, TestUtils.getGenericVnfRelatedLink(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, tenantRelationShipResponse.getStatusCode());
-
-        final Optional<Tenant> optional = cloudRegionCacheServiceProvider.getTenant(CLOUD_REGION_KEY, TENANT_ID);
-
-        assertTrue(optional.isPresent());
-        final Tenant actualTenant = optional.get();
-        final RelationshipList relationshipList = actualTenant.getRelationshipList();
-        assertNotNull(relationshipList);
-        assertFalse(relationshipList.getRelationship().isEmpty());
-
-        final Relationship relationship = relationshipList.getRelationship().get(0);
-
-        assertEquals(Constants.BELONGS_TO, relationship.getRelationshipLabel());
-        assertFalse(relationship.getRelationshipData().isEmpty());
-        assertEquals(1, relationship.getRelationshipData().size());
-
-        final List<RelationshipData> relationshipDataList = relationship.getRelationshipData();
-
-        final RelationshipData relationshipData =
-                getRelationshipData(relationshipDataList, Constants.GENERIC_VNF_VNF_ID);
-        assertNotNull(relationshipData);
-        assertEquals(VNF_ID, relationshipData.getRelationshipValue());
-
-        final List<RelatedToProperty> relatedToPropertyList = relationship.getRelatedToProperty();
-
-        final RelatedToProperty property = getRelatedToProperty(relatedToPropertyList, Constants.GENERIC_VNF_VNF_NAME);
-        assertNotNull(property);
-        assertEquals(GENERIC_VNF_NAME, property.getPropertyValue());
-
-        final Optional<GenericVnf> genericVnfOptional = genericVnfCacheServiceProvider.getGenericVnf(VNF_ID);
-        assertTrue(genericVnfOptional.isPresent());
-        final GenericVnf actualGenericVnf = genericVnfOptional.get();
-        final RelationshipList relationshipListGenericVnf = actualGenericVnf.getRelationshipList();
-        assertNotNull(relationshipListGenericVnf);
-        assertFalse(relationshipListGenericVnf.getRelationship().isEmpty());
-
-        final Relationship relationshipGenericVnf = relationshipListGenericVnf.getRelationship().get(0);
-
-        assertEquals(Constants.BELONGS_TO, relationshipGenericVnf.getRelationshipLabel());
-        assertFalse(relationshipGenericVnf.getRelationshipData().isEmpty());
-        assertEquals(3, relationshipGenericVnf.getRelationshipData().size());
-
-    }
-
-    @Test
-    public void test_putEsrSystemInfo_successfullyAddedToCache() throws Exception {
-        final String url = getUrl(TestConstants.CLOUD_REGIONS, CLOUD_OWNER_NAME, "/" + CLOUD_REGION_NAME);
-
-        invokeCloudRegionHttpPutEndPointAndAssertResponse(url);
-
-        final String esrSystemInfoListUrl = getUrl(TestConstants.CLOUD_REGIONS, CLOUD_OWNER_NAME,
-                "/" + CLOUD_REGION_NAME, ESR_SYSTEM_INFO_LIST_URL);
-
-        final String esrSystemInfoUrl = esrSystemInfoListUrl + "/esr-system-info/" + ESR_SYSTEM_INFO_ID;
-        final ResponseEntity<Void> esrSystemInfoResponse =
-                testRestTemplateService.invokeHttpPut(esrSystemInfoUrl, TestUtils.getEsrSystemInfo(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, esrSystemInfoResponse.getStatusCode());
-
-        final ResponseEntity<EsrSystemInfoList> response =
-                testRestTemplateService.invokeHttpGet(esrSystemInfoListUrl, EsrSystemInfoList.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-        final EsrSystemInfoList actualEsrSystemInfoList = response.getBody();
-
-        final List<EsrSystemInfo> esrSystemInfoList = actualEsrSystemInfoList.getEsrSystemInfo();
-        assertNotNull(esrSystemInfoList);
-        assertEquals(1, esrSystemInfoList.size());
-
-        final EsrSystemInfo esrSystemInfo = esrSystemInfoList.get(0);
-        assertEquals(ESR_SYSTEM_INFO_ID, esrSystemInfo.getEsrSystemInfoId());
-        assertEquals(SYSTEM_NAME, esrSystemInfo.getSystemName());
-        assertEquals(ESR_TYEP, esrSystemInfo.getType());
-        assertEquals(ESR_VENDOR, esrSystemInfo.getVendor());
-        assertEquals(ESR_SERVICE_URL, esrSystemInfo.getServiceUrl());
-        assertEquals(ESR_USERNAME, esrSystemInfo.getUserName());
-        assertEquals(ESR_PASSWORD, esrSystemInfo.getPassword());
-        assertEquals(ESR_SYSTEM_TYPE, esrSystemInfo.getSystemType());
-    }
-
-    @Test
-    public void test_putVServer_successfullyAddedToCache() throws Exception {
-        final String url = getUrl(TestConstants.CLOUD_REGIONS, CLOUD_OWNER_NAME, "/" + CLOUD_REGION_NAME);
-
-        invokeCloudRegionHttpPutEndPointAndAssertResponse(url);
-        addCustomerServiceAndGenericVnf();
-
-        final String tenantUrl = url + TENANTS_TENANT + TENANT_ID;
-        addTenantAndAssertResponse(tenantUrl);
-
-        final String vServerUrl = tenantUrl + VSERVER_URL + VSERVER_ID;
-
-        final ResponseEntity<Void> vServerResponse =
-                testRestTemplateService.invokeHttpPut(vServerUrl, TestUtils.getVserver(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, vServerResponse.getStatusCode());
-
-        final ResponseEntity<Vserver> response = testRestTemplateService.invokeHttpGet(vServerUrl, Vserver.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-        final Vserver actualVserver = response.getBody();
-        assertEquals(VSERVER_NAME, actualVserver.getVserverName());
-        assertEquals(VSERVER_ID, actualVserver.getVserverId());
-        assertEquals("active", actualVserver.getProvStatus());
-        assertNotNull(actualVserver.getRelationshipList());
-        assertFalse(actualVserver.getRelationshipList().getRelationship().isEmpty());
-
-        final Optional<GenericVnf> optional = genericVnfCacheServiceProvider.getGenericVnf(VNF_ID);
-        assertTrue(optional.isPresent());
-        final GenericVnf genericVnf = optional.get();
-        assertNotNull(genericVnf.getRelationshipList());
-        assertFalse(genericVnf.getRelationshipList().getRelationship().isEmpty());
-
-        final Relationship expectedRelationShip = genericVnf.getRelationshipList().getRelationship().get(0);
-        assertEquals(VSERVER, expectedRelationShip.getRelatedTo());
-        assertNotNull(expectedRelationShip.getRelationshipData());
-        assertEquals(4, expectedRelationShip.getRelationshipData().size());
-
-        final List<RelationshipData> relationshipDataList = expectedRelationShip.getRelationshipData();
-        final RelationshipData vServerrelationshipData =
-                getRelationshipData(relationshipDataList, Constants.VSERVER_VSERVER_ID);
-        assertNotNull(vServerrelationshipData);
-        assertEquals(VSERVER_ID, vServerrelationshipData.getRelationshipValue());
-
-        final RelationshipData cloudOwnerRelationshipData =
-                getRelationshipData(relationshipDataList, Constants.CLOUD_REGION_CLOUD_OWNER);
-        assertNotNull(cloudOwnerRelationshipData);
-        assertEquals(CLOUD_OWNER_NAME, cloudOwnerRelationshipData.getRelationshipValue());
-
-        final RelationshipData cloudRegionIdRelationshipData =
-                getRelationshipData(relationshipDataList, Constants.CLOUD_REGION_CLOUD_REGION_ID);
-        assertNotNull(cloudRegionIdRelationshipData);
-        assertEquals(CLOUD_REGION_NAME, cloudRegionIdRelationshipData.getRelationshipValue());
-
-        final RelationshipData tenantRelationshipData =
-                getRelationshipData(relationshipDataList, Constants.TENANT_TENANT_ID);
-        assertNotNull(tenantRelationshipData);
-        assertEquals(TENANT_ID, tenantRelationshipData.getRelationshipValue());
-
-    }
-
-    @Test
-    public void test_deleteVServer_successfullyRemoveFromCache() throws Exception {
-        final String url = getUrl(TestConstants.CLOUD_REGIONS, CLOUD_OWNER_NAME, "/" + CLOUD_REGION_NAME);
-
-        invokeCloudRegionHttpPutEndPointAndAssertResponse(url);
-        addCustomerServiceAndGenericVnf();
-
-        final String tenantUrl = url + TENANTS_TENANT + TENANT_ID;
-        addTenantAndAssertResponse(tenantUrl);
-
-        final String vServerAddUrl = tenantUrl + VSERVER_URL + VSERVER_ID;
-
-        final ResponseEntity<Void> vServerAddResponse =
-                testRestTemplateService.invokeHttpPut(vServerAddUrl, TestUtils.getVserver(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, vServerAddResponse.getStatusCode());
-
-        final Optional<Vserver> optional =
-                cloudRegionCacheServiceProvider.getVserver(CLOUD_REGION_KEY, TENANT_ID, VSERVER_ID);
-        assertTrue(optional.isPresent());
-        final Vserver vserver = optional.get();
-
-        final String vServerRemoveUrl = vServerAddUrl + "?resource-version=" + vserver.getResourceVersion();
-
-        final ResponseEntity<Void> responseEntity =
-                testRestTemplateService.invokeHttpDelete(vServerRemoveUrl, Void.class);
-        assertEquals(HttpStatus.NO_CONTENT, responseEntity.getStatusCode());
-        assertFalse(cloudRegionCacheServiceProvider.getVserver(CLOUD_REGION_KEY, TENANT_ID, VSERVER_ID).isPresent());
-
-
-    }
-
-    private void addTenantAndAssertResponse(final String tenantUrl) throws IOException {
-        final ResponseEntity<Void> responseEntity =
-                testRestTemplateService.invokeHttpPut(tenantUrl, TestUtils.getTenant(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, responseEntity.getStatusCode());
-    }
-
-    private void addCustomerServiceAndGenericVnf() throws Exception, IOException {
-        final ResponseEntity<Void> customerResponse =
-                testRestTemplateService.invokeHttpPut(getUrl(CUSTOMERS_URL), TestUtils.getCustomer(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, customerResponse.getStatusCode());
-
-        final String serviceInstanceUrl = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
-        final ResponseEntity<Void> serviceInstanceResponse =
-                testRestTemplateService.invokeHttpPut(serviceInstanceUrl, TestUtils.getServiceInstance(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, serviceInstanceResponse.getStatusCode());
-
-        final String genericVnfUrl = getUrl(GENERIC_VNF_URL, VNF_ID);
-        final ResponseEntity<Void> genericVnfResponse =
-                testRestTemplateService.invokeHttpPut(genericVnfUrl, TestUtils.getGenericVnf(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, genericVnfResponse.getStatusCode());
-
-    }
-
-    private void invokeCloudRegionHttpPutEndPointAndAssertResponse(final String url) throws IOException {
-        final ResponseEntity<Void> responseEntity =
-                testRestTemplateService.invokeHttpPut(url, TestUtils.getCloudRegion(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, responseEntity.getStatusCode());
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrControllerTest.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrControllerTest.java
deleted file mode 100755
index 2fd5f7b8..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrControllerTest.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.onap.so.aaisimulator.utils.Constants.RELATIONSHIP_LIST_RELATIONSHIP_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.CUSTOMERS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_PASSWORD;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_SERVICE_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_SYSTEM_INFO_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_SYSTEM_INFO_LIST_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_SYSTEM_TYPE;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_TYEP;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_USERNAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_VENDOR;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_VIM_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_VNFM_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.ESR_VNFM_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.GENERIC_VNF_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_INSTANCE_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_SUBSCRIPTIONS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SYSTEM_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.VNF_ID;
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-import org.junit.After;
-import org.junit.Test;
-import org.onap.aai.domain.yang.EsrSystemInfo;
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.aai.domain.yang.EsrVnfm;
-import org.onap.aai.domain.yang.EsrVnfmList;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.RelationshipList;
-import org.onap.so.aaisimulator.service.providers.ExternalSystemCacheServiceProvider;
-import org.onap.so.aaisimulator.service.providers.GenericVnfCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.Constants;
-import org.onap.so.aaisimulator.utils.TestConstants;
-import org.onap.so.aaisimulator.utils.TestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public class ExternalSystemEsrControllerTest extends AbstractSpringBootTest {
-
-    @Autowired
-    private ExternalSystemCacheServiceProvider externalSystemCacheServiceProvider;
-
-
-    @Autowired
-    private GenericVnfCacheServiceProvider genericVnfCacheServiceProvider;
-
-    @After
-    public void after() {
-        externalSystemCacheServiceProvider.clearAll();
-        genericVnfCacheServiceProvider.clearAll();
-    }
-
-    @Test
-    public void test_putEsrVnfm_successfullyAddedToCache() throws Exception {
-        final String esrVnfmUrl = getUrl(ESR_VNFM_URL, ESR_VNFM_ID);
-        addEsrVnfmAndAssertResponse(esrVnfmUrl);
-
-        final ResponseEntity<EsrVnfm> response = testRestTemplateService.invokeHttpGet(esrVnfmUrl, EsrVnfm.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-
-        final EsrVnfm actualEsrVnfm = response.getBody();
-        assertEquals(ESR_VNFM_ID, actualEsrVnfm.getVnfmId());
-        assertEquals(ESR_VIM_ID, actualEsrVnfm.getVimId());
-
-    }
-
-    @Test
-    public void test_getEsrVnfmList_getAllEsrVnfmsFromCache() throws Exception {
-        final String esrVnfmUrl = getUrl(ESR_VNFM_URL, ESR_VNFM_ID);
-        addEsrVnfmAndAssertResponse(esrVnfmUrl);
-
-        final String esrVnfmListUrl = getUrl(TestConstants.EXTERNAL_SYSTEM_ESR_VNFM_LIST_URL);
-        final ResponseEntity<EsrVnfmList> response =
-                testRestTemplateService.invokeHttpGet(esrVnfmListUrl, EsrVnfmList.class);
-
-        assertTrue(response.hasBody());
-
-        final EsrVnfmList actualEsrVnfmList = response.getBody();
-
-        final List<EsrVnfm> esrVnfmList = actualEsrVnfmList.getEsrVnfm();
-        assertNotNull(esrVnfmList);
-        assertEquals(1, esrVnfmList.size());
-        final EsrVnfm actualEsrVnfm = esrVnfmList.get(0);
-        assertEquals(ESR_VNFM_ID, actualEsrVnfm.getVnfmId());
-        assertEquals(ESR_VIM_ID, actualEsrVnfm.getVimId());
-
-    }
-
-    @Test
-    public void test_putEsrSystemInfo_successfullyAddedToCache() throws Exception {
-        final String esrVnfmUrl = getUrl(ESR_VNFM_URL, ESR_VNFM_ID);
-        addEsrVnfmAndAssertResponse(esrVnfmUrl);
-        final String esrSystemInfoListUrl = getUrl(ESR_VNFM_URL, ESR_VNFM_ID, ESR_SYSTEM_INFO_LIST_URL);
-
-        final String esrSystemInfoUrl = esrSystemInfoListUrl + "/esr-system-info/" + ESR_SYSTEM_INFO_ID;
-        final ResponseEntity<Void> esrSystemInfoResponse =
-                testRestTemplateService.invokeHttpPut(esrSystemInfoUrl, TestUtils.getEsrSystemInfo(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, esrSystemInfoResponse.getStatusCode());
-
-        final ResponseEntity<EsrSystemInfoList> response =
-                testRestTemplateService.invokeHttpGet(esrSystemInfoListUrl, EsrSystemInfoList.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-        final EsrSystemInfoList actualEsrSystemInfoList = response.getBody();
-
-        final List<EsrSystemInfo> esrSystemInfoList = actualEsrSystemInfoList.getEsrSystemInfo();
-        assertNotNull(esrSystemInfoList);
-        assertEquals(1, esrSystemInfoList.size());
-
-        final EsrSystemInfo esrSystemInfo = esrSystemInfoList.get(0);
-        assertEquals(ESR_SYSTEM_INFO_ID, esrSystemInfo.getEsrSystemInfoId());
-        assertEquals(SYSTEM_NAME, esrSystemInfo.getSystemName());
-        assertEquals(ESR_TYEP, esrSystemInfo.getType());
-        assertEquals(ESR_VENDOR, esrSystemInfo.getVendor());
-        assertEquals(ESR_SERVICE_URL, esrSystemInfo.getServiceUrl());
-        assertEquals(ESR_USERNAME, esrSystemInfo.getUserName());
-        assertEquals(ESR_PASSWORD, esrSystemInfo.getPassword());
-        assertEquals(ESR_SYSTEM_TYPE, esrSystemInfo.getSystemType());
-
-
-    }
-
-    @Test
-    public void test_putEsrRelationToGenericVnfm_successfullyAddedToCache() throws Exception {
-        final String esrVnfmUrl = getUrl(ESR_VNFM_URL, ESR_VNFM_ID);
-
-        addEsrVnfmAndAssertResponse(esrVnfmUrl);
-        addCustomerServiceAndGenericVnf();
-
-        final String relationShipUrl = esrVnfmUrl + RELATIONSHIP_LIST_RELATIONSHIP_URL;
-
-        final ResponseEntity<Void> response = testRestTemplateService.invokeHttpPut(relationShipUrl,
-                TestUtils.getGenericVnfRelatedLink(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
-
-        final Optional<EsrVnfm> optional = externalSystemCacheServiceProvider.getEsrVnfm(ESR_VNFM_ID);
-        assertTrue(optional.isPresent());
-
-        final EsrVnfm actualEsrVnfm = optional.get();
-        final RelationshipList relationshipList = actualEsrVnfm.getRelationshipList();
-        assertNotNull(relationshipList);
-        assertFalse(relationshipList.getRelationship().isEmpty());
-
-        final Relationship relationship = relationshipList.getRelationship().get(0);
-
-        assertEquals(Constants.DEPENDS_ON, relationship.getRelationshipLabel());
-        assertFalse(relationship.getRelationshipData().isEmpty());
-        assertEquals(1, relationship.getRelationshipData().size());
-
-        final RelationshipData relationshipData =
-                getRelationshipData(relationship.getRelationshipData(), Constants.GENERIC_VNF_VNF_ID);
-        assertNotNull(relationshipData);
-        assertEquals(VNF_ID, relationshipData.getRelationshipValue());
-
-        final Optional<GenericVnf> genericVnfOptional = genericVnfCacheServiceProvider.getGenericVnf(VNF_ID);
-        assertTrue(genericVnfOptional.isPresent());
-        final GenericVnf actualGenericVnf = genericVnfOptional.get();
-        final RelationshipList relationshipListGenericVnf = actualGenericVnf.getRelationshipList();
-        assertNotNull(relationshipListGenericVnf);
-        assertFalse(relationshipListGenericVnf.getRelationship().isEmpty());
-
-        final Relationship relationshipGenericVnf = relationshipListGenericVnf.getRelationship().get(0);
-
-        assertEquals(Constants.DEPENDS_ON, relationshipGenericVnf.getRelationshipLabel());
-        assertFalse(relationshipGenericVnf.getRelationshipData().isEmpty());
-        assertEquals(1, relationshipGenericVnf.getRelationshipData().size());
-
-        final RelationshipData esrRelationshipData =
-                getRelationshipData(relationshipGenericVnf.getRelationshipData(), Constants.ESR_VNFM_VNFM_ID);
-        assertNotNull(esrRelationshipData);
-        assertEquals(ESR_VNFM_ID, esrRelationshipData.getRelationshipValue());
-
-
-    }
-
-    private void addEsrVnfmAndAssertResponse(final String esrVnfmUrl) throws IOException {
-        final ResponseEntity<Void> esrVnfmResponse =
-                testRestTemplateService.invokeHttpPut(esrVnfmUrl, TestUtils.getEsrVnfm(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, esrVnfmResponse.getStatusCode());
-    }
-
-    private void addCustomerServiceAndGenericVnf() throws Exception, IOException {
-        final ResponseEntity<Void> customerResponse =
-                testRestTemplateService.invokeHttpPut(getUrl(CUSTOMERS_URL), TestUtils.getCustomer(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, customerResponse.getStatusCode());
-
-        final String serviceInstanceUrl = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
-        final ResponseEntity<Void> serviceInstanceResponse =
-                testRestTemplateService.invokeHttpPut(serviceInstanceUrl, TestUtils.getServiceInstance(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, serviceInstanceResponse.getStatusCode());
-
-        final String genericVnfUrl = getUrl(GENERIC_VNF_URL, VNF_ID);
-        final ResponseEntity<Void> genericVnfResponse =
-                testRestTemplateService.invokeHttpPut(genericVnfUrl, TestUtils.getGenericVnf(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, genericVnfResponse.getStatusCode());
-
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/GenericVnfsControllerTest.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/GenericVnfsControllerTest.java
deleted file mode 100755
index 8b6ec8c7..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/GenericVnfsControllerTest.java
+++ /dev/null
@@ -1,430 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.onap.so.aaisimulator.utils.Constants.BI_DIRECTIONAL_RELATIONSHIP_LIST_URL;
-import static org.onap.so.aaisimulator.utils.Constants.RELATIONSHIP_LIST_RELATIONSHIP_URL;
-import static org.onap.so.aaisimulator.utils.Constants.X_HTTP_METHOD_OVERRIDE;
-import static org.onap.so.aaisimulator.utils.TestConstants.CLOUD_OWNER_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.CLOUD_REGION_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.CUSTOMERS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.GENERIC_VNF_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.GENERIC_VNF_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.GLOBAL_CUSTOMER_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.LINE_OF_BUSINESS_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.PLATFORM_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_INSTANCE_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_INSTANCE_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_SUBSCRIPTIONS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_TYPE;
-import static org.onap.so.aaisimulator.utils.TestConstants.VNF_ID;
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-import org.junit.After;
-import org.junit.Test;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.GenericVnfs;
-import org.onap.aai.domain.yang.RelatedToProperty;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.RelationshipList;
-import org.onap.aai.domain.yang.ServiceInstance;
-import org.onap.so.aaisimulator.service.providers.CustomerCacheServiceProvider;
-import org.onap.so.aaisimulator.service.providers.GenericVnfCacheServiceProvider;
-import org.onap.so.aaisimulator.service.providers.LinesOfBusinessCacheServiceProvider;
-import org.onap.so.aaisimulator.service.providers.PlatformCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.Constants;
-import org.onap.so.aaisimulator.utils.TestConstants;
-import org.onap.so.aaisimulator.utils.TestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public class GenericVnfsControllerTest extends AbstractSpringBootTest {
-
-    @Autowired
-    private CustomerCacheServiceProvider customerCacheServiceProvider;
-
-    @Autowired
-    private GenericVnfCacheServiceProvider genericVnfCacheServiceProvider;
-
-    @Autowired
-    private LinesOfBusinessCacheServiceProvider linesOfBusinessCacheServiceProvider;
-
-    @Autowired
-    private PlatformCacheServiceProvider platformVnfCacheServiceProvider;
-
-    @After
-    public void after() {
-        customerCacheServiceProvider.clearAll();
-        genericVnfCacheServiceProvider.clearAll();
-        platformVnfCacheServiceProvider.clearAll();
-        linesOfBusinessCacheServiceProvider.clearAll();
-    }
-
-    @Test
-    public void test_putGenericVnf_successfullyAddedToCache() throws Exception {
-
-        final String genericVnfUrl = getUrl(GENERIC_VNF_URL, VNF_ID);
-        final ResponseEntity<Void> genericVnfResponse =
-                testRestTemplateService.invokeHttpPut(genericVnfUrl, TestUtils.getGenericVnf(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, genericVnfResponse.getStatusCode());
-
-        final ResponseEntity<GenericVnf> response =
-                testRestTemplateService.invokeHttpGet(genericVnfUrl, GenericVnf.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-
-        final GenericVnf actualGenericVnf = response.getBody();
-        assertEquals(GENERIC_VNF_NAME, actualGenericVnf.getVnfName());
-        assertEquals(VNF_ID, actualGenericVnf.getVnfId());
-
-    }
-
-    @Test
-    public void test_putGenericVnfRelation_successfullyAddedToCache() throws Exception {
-
-        addCustomerServiceAndGenericVnf();
-
-        final String genericVnfRelationShipUrl = getUrl(GENERIC_VNF_URL, VNF_ID, RELATIONSHIP_LIST_RELATIONSHIP_URL);
-        final ResponseEntity<Void> genericVnfRelationShipResponse = testRestTemplateService
-                .invokeHttpPut(genericVnfRelationShipUrl, TestUtils.getRelationShip(), Void.class);
-
-        assertEquals(HttpStatus.ACCEPTED, genericVnfRelationShipResponse.getStatusCode());
-
-
-        final Optional<ServiceInstance> optional =
-                customerCacheServiceProvider.getServiceInstance(GLOBAL_CUSTOMER_ID, SERVICE_TYPE, SERVICE_INSTANCE_ID);
-
-        assertTrue(optional.isPresent());
-
-        final ServiceInstance actualServiceInstance = optional.get();
-        final RelationshipList actualRelationshipList = actualServiceInstance.getRelationshipList();
-        assertNotNull(actualRelationshipList);
-        assertFalse(actualRelationshipList.getRelationship().isEmpty());
-        final Relationship actualRelationShip = actualRelationshipList.getRelationship().get(0);
-
-        assertEquals(Constants.COMPOSED_OF, actualRelationShip.getRelationshipLabel());
-        assertEquals(GENERIC_VNF_URL + VNF_ID, actualRelationShip.getRelatedLink());
-
-
-        assertFalse(actualRelationShip.getRelatedToProperty().isEmpty());
-        assertFalse(actualRelationShip.getRelationshipData().isEmpty());
-        final RelatedToProperty actualRelatedToProperty = actualRelationShip.getRelatedToProperty().get(0);
-        final RelationshipData actualRelationshipData = actualRelationShip.getRelationshipData().get(0);
-
-        assertEquals(Constants.GENERIC_VNF_VNF_NAME, actualRelatedToProperty.getPropertyKey());
-        assertEquals(GENERIC_VNF_NAME, actualRelatedToProperty.getPropertyValue());
-        assertEquals(Constants.GENERIC_VNF_VNF_ID, actualRelationshipData.getRelationshipKey());
-        assertEquals(VNF_ID, actualRelationshipData.getRelationshipValue());
-
-        final Optional<GenericVnf> genericVnfOptional = genericVnfCacheServiceProvider.getGenericVnf(VNF_ID);
-        assertTrue(genericVnfOptional.isPresent());
-        final GenericVnf actualGenericVnf = genericVnfOptional.get();
-        final RelationshipList relationshipList = actualGenericVnf.getRelationshipList();
-        assertNotNull(relationshipList);
-        assertFalse(relationshipList.getRelationship().isEmpty());
-
-        final Relationship relationship = relationshipList.getRelationship().get(0);
-        assertFalse(relationship.getRelatedToProperty().isEmpty());
-        assertEquals(3, relationship.getRelationshipData().size());
-        assertEquals(CUSTOMERS_URL + SERVICE_SUBSCRIPTIONS_URL + SERVICE_INSTANCE_URL, relationship.getRelatedLink());
-
-
-        final List<RelatedToProperty> relatedToProperty = relationship.getRelatedToProperty();
-        final RelatedToProperty firstRelatedToProperty = relatedToProperty.get(0);
-        assertEquals(Constants.SERVICE_INSTANCE_SERVICE_INSTANCE_NAME, firstRelatedToProperty.getPropertyKey());
-        assertEquals(SERVICE_NAME, firstRelatedToProperty.getPropertyValue());
-
-        final List<RelationshipData> relationshipData = relationship.getRelationshipData();
-
-        final RelationshipData globalRelationshipData =
-                getRelationshipData(relationshipData, Constants.CUSTOMER_GLOBAL_CUSTOMER_ID);
-        assertNotNull(globalRelationshipData);
-        assertEquals(GLOBAL_CUSTOMER_ID, globalRelationshipData.getRelationshipValue());
-
-        final RelationshipData serviceSubscriptionRelationshipData =
-                getRelationshipData(relationshipData, Constants.SERVICE_SUBSCRIPTION_SERVICE_TYPE);
-        assertNotNull(serviceSubscriptionRelationshipData);
-        assertEquals(SERVICE_TYPE, serviceSubscriptionRelationshipData.getRelationshipValue());
-
-        final RelationshipData serviceInstanceRelationshipData =
-                getRelationshipData(relationshipData, Constants.SERVICE_INSTANCE_SERVICE_INSTANCE_ID);
-        assertNotNull(serviceInstanceRelationshipData);
-        assertEquals(SERVICE_INSTANCE_ID, serviceInstanceRelationshipData.getRelationshipValue());
-
-    }
-
-    @Test
-    public void test_putGenericVnfRelationToPlatform_successfullyAddedToCache() throws Exception {
-        addCustomerServiceAndGenericVnf();
-
-        final String platformUrl = getUrl(TestConstants.PLATFORMS_URL, PLATFORM_NAME);
-        final ResponseEntity<Void> platformResponse =
-                testRestTemplateService.invokeHttpPut(platformUrl, TestUtils.getPlatform(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, platformResponse.getStatusCode());
-
-        final String genericVnfRelationShipUrl = getUrl(GENERIC_VNF_URL, VNF_ID, RELATIONSHIP_LIST_RELATIONSHIP_URL);
-        final ResponseEntity<Void> genericVnfRelationShipResponse = testRestTemplateService
-                .invokeHttpPut(genericVnfRelationShipUrl, TestUtils.getPlatformRelatedLink(), Void.class);
-
-        assertEquals(HttpStatus.ACCEPTED, genericVnfRelationShipResponse.getStatusCode());
-
-        final Optional<GenericVnf> genericVnfOptional = genericVnfCacheServiceProvider.getGenericVnf(VNF_ID);
-        assertTrue(genericVnfOptional.isPresent());
-        final GenericVnf actualGenericVnf = genericVnfOptional.get();
-        final RelationshipList relationshipList = actualGenericVnf.getRelationshipList();
-        assertNotNull(relationshipList);
-        assertFalse(relationshipList.getRelationship().isEmpty());
-
-        final Relationship relationship = relationshipList.getRelationship().get(0);
-
-        assertEquals(Constants.USES, relationship.getRelationshipLabel());
-        assertFalse(relationship.getRelationshipData().isEmpty());
-        assertEquals(1, relationship.getRelationshipData().size());
-        assertEquals(TestConstants.PLATFORMS_URL + PLATFORM_NAME, relationship.getRelatedLink());
-
-
-        final List<RelationshipData> relationshipData = relationship.getRelationshipData();
-
-        final RelationshipData platformRelationshipData =
-                getRelationshipData(relationshipData, Constants.PLATFORM_PLATFORM_NAME);
-        assertNotNull(platformRelationshipData);
-        assertEquals(PLATFORM_NAME, platformRelationshipData.getRelationshipValue());
-
-    }
-
-    @Test
-    public void test_putGenericVnfRelationToLineOfBusiness_successfullyAddedToCache() throws Exception {
-        addCustomerServiceAndGenericVnf();
-
-        final String url = getUrl(TestConstants.LINES_OF_BUSINESS_URL, LINE_OF_BUSINESS_NAME);
-        final ResponseEntity<Void> responseEntity =
-                testRestTemplateService.invokeHttpPut(url, TestUtils.getLineOfBusiness(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, responseEntity.getStatusCode());
-
-        final String genericVnfRelationShipUrl = getUrl(GENERIC_VNF_URL, VNF_ID, RELATIONSHIP_LIST_RELATIONSHIP_URL);
-        final ResponseEntity<Void> genericVnfRelationShipResponse = testRestTemplateService
-                .invokeHttpPut(genericVnfRelationShipUrl, TestUtils.getLineOfBusinessRelatedLink(), Void.class);
-
-        assertEquals(HttpStatus.ACCEPTED, genericVnfRelationShipResponse.getStatusCode());
-
-        final Optional<GenericVnf> genericVnfOptional = genericVnfCacheServiceProvider.getGenericVnf(VNF_ID);
-        assertTrue(genericVnfOptional.isPresent());
-        final GenericVnf actualGenericVnf = genericVnfOptional.get();
-        final RelationshipList relationshipList = actualGenericVnf.getRelationshipList();
-        assertNotNull(relationshipList);
-        assertFalse(relationshipList.getRelationship().isEmpty());
-
-        final Relationship relationship = relationshipList.getRelationship().get(0);
-
-        assertEquals(Constants.USES, relationship.getRelationshipLabel());
-        assertEquals(TestConstants.LINES_OF_BUSINESS_URL + LINE_OF_BUSINESS_NAME, relationship.getRelatedLink());
-
-        assertFalse(relationship.getRelationshipData().isEmpty());
-        assertEquals(1, relationship.getRelationshipData().size());
-
-        final List<RelationshipData> relationshipData = relationship.getRelationshipData();
-
-        final RelationshipData lineOfBusinessRelationshipData =
-                getRelationshipData(relationshipData, Constants.LINE_OF_BUSINESS_LINE_OF_BUSINESS_NAME);
-        assertNotNull(lineOfBusinessRelationshipData);
-        assertEquals(LINE_OF_BUSINESS_NAME, lineOfBusinessRelationshipData.getRelationshipValue());
-
-    }
-
-    @Test
-    public void test_putGenericVnfRelationToCloudRegion_successfullyAddedToCache() throws Exception {
-        addCustomerServiceAndGenericVnf();
-
-        final String url = getUrl(TestConstants.CLOUD_REGIONS, CLOUD_OWNER_NAME, "/" + CLOUD_REGION_NAME);
-
-        final ResponseEntity<Void> responseEntity =
-                testRestTemplateService.invokeHttpPut(url, TestUtils.getCloudRegion(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, responseEntity.getStatusCode());
-
-        final String genericVnfRelationShipUrl = getUrl(GENERIC_VNF_URL, VNF_ID, RELATIONSHIP_LIST_RELATIONSHIP_URL);
-        final ResponseEntity<Void> genericVnfRelationShipResponse = testRestTemplateService
-                .invokeHttpPut(genericVnfRelationShipUrl, TestUtils.getCloudRegionRelatedLink(), Void.class);
-
-        assertEquals(HttpStatus.ACCEPTED, genericVnfRelationShipResponse.getStatusCode());
-
-        final Optional<GenericVnf> genericVnfOptional = genericVnfCacheServiceProvider.getGenericVnf(VNF_ID);
-        assertTrue(genericVnfOptional.isPresent());
-        final GenericVnf actualGenericVnf = genericVnfOptional.get();
-        final RelationshipList relationshipList = actualGenericVnf.getRelationshipList();
-        assertNotNull(relationshipList);
-        assertFalse(relationshipList.getRelationship().isEmpty());
-
-        final Relationship relationship = relationshipList.getRelationship().get(0);
-
-        assertEquals(Constants.LOCATED_IN, relationship.getRelationshipLabel());
-        assertEquals(TestConstants.CLOUD_REGIONS + CLOUD_OWNER_NAME + "/" + CLOUD_REGION_NAME,
-                relationship.getRelatedLink());
-
-        assertFalse(relationship.getRelationshipData().isEmpty());
-        assertEquals(2, relationship.getRelationshipData().size());
-
-        final List<RelationshipData> relationshipDataList = relationship.getRelationshipData();
-
-        final RelationshipData cloudOwnerRelationshipData =
-                getRelationshipData(relationshipDataList, Constants.CLOUD_REGION_CLOUD_OWNER);
-        assertNotNull(cloudOwnerRelationshipData);
-        assertEquals(CLOUD_OWNER_NAME, cloudOwnerRelationshipData.getRelationshipValue());
-
-        final RelationshipData cloudRegionIdRelationshipData =
-                getRelationshipData(relationshipDataList, Constants.CLOUD_REGION_CLOUD_REGION_ID);
-        assertNotNull(cloudRegionIdRelationshipData);
-        assertEquals(CLOUD_REGION_NAME, cloudRegionIdRelationshipData.getRelationshipValue());
-
-        final List<RelatedToProperty> relatedToPropertyList = relationship.getRelatedToProperty();
-
-        final RelatedToProperty cloudRegionOwnerDefinedTypeProperty =
-                getRelatedToProperty(relatedToPropertyList, Constants.CLOUD_REGION_OWNER_DEFINED_TYPE);
-        assertNotNull(cloudRegionOwnerDefinedTypeProperty);
-        assertEquals("OwnerType", cloudRegionOwnerDefinedTypeProperty.getPropertyValue());
-
-    }
-
-    @Test
-    public void test_putBiDirectionalRelationShip_successfullyAddedToCache() throws Exception {
-        addCustomerServiceAndGenericVnf();
-
-        final String relationShipUrl = getUrl(GENERIC_VNF_URL, VNF_ID, BI_DIRECTIONAL_RELATIONSHIP_LIST_URL);
-
-        final ResponseEntity<Relationship> responseEntity = testRestTemplateService.invokeHttpPut(relationShipUrl,
-                TestUtils.getTenantRelationShip(), Relationship.class);
-        assertEquals(HttpStatus.ACCEPTED, responseEntity.getStatusCode());
-
-        final Optional<GenericVnf> optional = genericVnfCacheServiceProvider.getGenericVnf(VNF_ID);
-        assertTrue(optional.isPresent());
-
-        final GenericVnf actual = optional.get();
-
-        assertNotNull(actual.getRelationshipList());
-        final List<Relationship> relationshipList = actual.getRelationshipList().getRelationship();
-        assertFalse("Relationship list should not be empty", relationshipList.isEmpty());
-        final Relationship relationship = relationshipList.get(0);
-
-        assertFalse("RelationshipData list should not be empty", relationship.getRelationshipData().isEmpty());
-        assertFalse("RelatedToProperty list should not be empty", relationship.getRelatedToProperty().isEmpty());
-    }
-
-    @Test
-    public void test_patchGenericVnf_usingVnfId_OrchStatusChangedInCache() throws Exception {
-        addCustomerServiceAndGenericVnf();
-
-        final HttpHeaders httpHeaders = testRestTemplateService.getHttpHeaders();
-        httpHeaders.add(X_HTTP_METHOD_OVERRIDE, HttpMethod.PATCH.toString());
-        httpHeaders.remove(HttpHeaders.CONTENT_TYPE);
-        httpHeaders.add(HttpHeaders.CONTENT_TYPE, Constants.APPLICATION_MERGE_PATCH_JSON);
-
-        final String genericVnfUrl = getUrl(GENERIC_VNF_URL, VNF_ID);
-        final ResponseEntity<Void> orchStatuUpdateServiceInstanceResponse = testRestTemplateService
-                .invokeHttpPost(httpHeaders, genericVnfUrl, TestUtils.getGenericVnfOrchStatuUpdate(), Void.class);
-
-        assertEquals(HttpStatus.ACCEPTED, orchStatuUpdateServiceInstanceResponse.getStatusCode());
-
-        final ResponseEntity<GenericVnf> response =
-                testRestTemplateService.invokeHttpGet(genericVnfUrl, GenericVnf.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-
-        final GenericVnf actualGenericVnf = response.getBody();
-        assertEquals(GENERIC_VNF_NAME, actualGenericVnf.getVnfName());
-        assertEquals(VNF_ID, actualGenericVnf.getVnfId());
-        assertEquals("Assigned", actualGenericVnf.getOrchestrationStatus());
-
-    }
-
-    @Test
-    public void test_getGenericVnfs_usingSelfLink_getAllGenericVnfsInCache() throws Exception {
-
-        addCustomerServiceAndGenericVnf();
-
-        final String selfLink = "http://localhost:9921/generic-vnf/" + VNF_ID;
-        final String url = getUrl(TestConstants.GENERIC_VNFS_URL_1) + "?selflink=" + selfLink;
-        final ResponseEntity<GenericVnfs> response = testRestTemplateService.invokeHttpGet(url, GenericVnfs.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-
-        final GenericVnfs actualGenericVnfs = response.getBody();
-        final List<GenericVnf> genericVnfList = actualGenericVnfs.getGenericVnf();
-        assertNotNull(genericVnfList);
-        assertEquals(1, genericVnfList.size());
-        final GenericVnf actualGenericVnf = genericVnfList.get(0);
-        assertEquals(selfLink, actualGenericVnf.getSelflink());
-        assertEquals(GENERIC_VNF_NAME, actualGenericVnf.getVnfName());
-        assertEquals(VNF_ID, actualGenericVnf.getVnfId());
-    }
-
-    @Test
-    public void test_deleteGenericVnf_usingVnfIdAndResourceVersion_removedFromCache() throws Exception {
-
-        addCustomerServiceAndGenericVnf();
-
-        final Optional<GenericVnf> genericVnfOptional = genericVnfCacheServiceProvider.getGenericVnf(VNF_ID);
-        assertTrue(genericVnfOptional.isPresent());
-        final GenericVnf genericVnf = genericVnfOptional.get();
-
-        final String genericVnfDeleteUrl =
-                getUrl(GENERIC_VNF_URL, genericVnf.getVnfId()) + "?resource-version=" + genericVnf.getResourceVersion();
-
-        final ResponseEntity<Void> responseEntity =
-                testRestTemplateService.invokeHttpDelete(genericVnfDeleteUrl, Void.class);
-        assertEquals(HttpStatus.NO_CONTENT, responseEntity.getStatusCode());
-        assertFalse(genericVnfCacheServiceProvider.getGenericVnf(VNF_ID).isPresent());
-
-    }
-
-    private void addCustomerServiceAndGenericVnf() throws Exception, IOException {
-        final ResponseEntity<Void> customerResponse =
-                testRestTemplateService.invokeHttpPut(getUrl(CUSTOMERS_URL), TestUtils.getCustomer(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, customerResponse.getStatusCode());
-
-        final String serviceInstanceUrl = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
-        final ResponseEntity<Void> serviceInstanceResponse =
-                testRestTemplateService.invokeHttpPut(serviceInstanceUrl, TestUtils.getServiceInstance(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, serviceInstanceResponse.getStatusCode());
-
-        final String genericVnfUrl = getUrl(GENERIC_VNF_URL, VNF_ID);
-        final ResponseEntity<Void> genericVnfResponse =
-                testRestTemplateService.invokeHttpPut(genericVnfUrl, TestUtils.getGenericVnf(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, genericVnfResponse.getStatusCode());
-
-    }
-
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/LinesOfBusinessControllerTest.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/LinesOfBusinessControllerTest.java
deleted file mode 100755
index 30b3d279..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/LinesOfBusinessControllerTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.onap.so.aaisimulator.utils.Constants.BI_DIRECTIONAL_RELATIONSHIP_LIST_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.GENERIC_VNF_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.LINE_OF_BUSINESS_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.VNF_ID;
-import java.util.List;
-import java.util.Optional;
-import org.junit.After;
-import org.junit.Test;
-import org.onap.aai.domain.yang.LineOfBusiness;
-import org.onap.aai.domain.yang.RelatedToProperty;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.so.aaisimulator.models.Format;
-import org.onap.so.aaisimulator.models.Results;
-import org.onap.so.aaisimulator.service.providers.LinesOfBusinessCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.Constants;
-import org.onap.so.aaisimulator.utils.TestConstants;
-import org.onap.so.aaisimulator.utils.TestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public class LinesOfBusinessControllerTest extends AbstractSpringBootTest {
-
-    @Autowired
-    private LinesOfBusinessCacheServiceProvider linesOfBusinessCacheServiceProvider;
-
-    @After
-    public void after() {
-        linesOfBusinessCacheServiceProvider.clearAll();
-    }
-
-    @Test
-    public void test_putLineOfBusiness_successfullyAddedToCache() throws Exception {
-
-        final String url = getUrl(TestConstants.LINES_OF_BUSINESS_URL, LINE_OF_BUSINESS_NAME);
-        final ResponseEntity<Void> lineOfBusinessResponse =
-                testRestTemplateService.invokeHttpPut(url, TestUtils.getLineOfBusiness(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, lineOfBusinessResponse.getStatusCode());
-
-        final ResponseEntity<LineOfBusiness> response =
-                testRestTemplateService.invokeHttpGet(url, LineOfBusiness.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-
-        final LineOfBusiness actualLineOfBusiness = response.getBody();
-        assertEquals(LINE_OF_BUSINESS_NAME, actualLineOfBusiness.getLineOfBusinessName());
-        assertNotNull("resource version should not be null", actualLineOfBusiness.getResourceVersion());
-
-    }
-
-    @Test
-    public void test_getLineOfBusinessWithFormatCount() throws Exception {
-
-        final String url = getUrl(TestConstants.LINES_OF_BUSINESS_URL, LINE_OF_BUSINESS_NAME);
-        final ResponseEntity<Void> lineOfBusinessResponse =
-                testRestTemplateService.invokeHttpPut(url, TestUtils.getLineOfBusiness(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, lineOfBusinessResponse.getStatusCode());
-
-        final ResponseEntity<Results> response = testRestTemplateService
-                .invokeHttpGet(url + "?resultIndex=0&resultSize=1&format=" + Format.COUNT.getValue(), Results.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-
-        final Results result = response.getBody();
-        assertNotNull(result.getValues());
-        assertFalse(result.getValues().isEmpty());
-        assertEquals(1, result.getValues().get(0).get(Constants.LINE_OF_BUSINESS));
-    }
-
-
-    @Test
-    public void test_putGenericVnfRelationShipToPlatform_successfullyAddedToCache() throws Exception {
-
-        final String url = getUrl(TestConstants.LINES_OF_BUSINESS_URL, LINE_OF_BUSINESS_NAME);
-        final ResponseEntity<Void> response =
-                testRestTemplateService.invokeHttpPut(url, TestUtils.getLineOfBusiness(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
-
-        final String relationShipUrl = getUrl(TestConstants.LINES_OF_BUSINESS_URL, LINE_OF_BUSINESS_NAME,
-                BI_DIRECTIONAL_RELATIONSHIP_LIST_URL);
-
-        final ResponseEntity<Relationship> responseEntity = testRestTemplateService.invokeHttpPut(relationShipUrl,
-                TestUtils.getGenericVnfRelationShip(), Relationship.class);
-        assertEquals(HttpStatus.ACCEPTED, responseEntity.getStatusCode());
-
-        final Optional<LineOfBusiness> optional =
-                linesOfBusinessCacheServiceProvider.getLineOfBusiness(LINE_OF_BUSINESS_NAME);
-        assertTrue(optional.isPresent());
-
-        final LineOfBusiness actual = optional.get();
-
-        assertNotNull(actual.getRelationshipList());
-        final List<Relationship> relationshipList = actual.getRelationshipList().getRelationship();
-        assertFalse("Relationship list should not be empty", relationshipList.isEmpty());
-        final Relationship relationship = relationshipList.get(0);
-
-        assertEquals(GENERIC_VNF_URL + VNF_ID, relationship.getRelatedLink());
-        assertFalse("RelationshipData list should not be empty", relationship.getRelationshipData().isEmpty());
-        assertFalse("RelatedToProperty list should not be empty", relationship.getRelatedToProperty().isEmpty());
-
-        final RelationshipData relationshipData = relationship.getRelationshipData().get(0);
-        assertEquals(Constants.GENERIC_VNF_VNF_ID, relationshipData.getRelationshipKey());
-        assertEquals(TestConstants.VNF_ID, relationshipData.getRelationshipValue());
-
-        final RelatedToProperty relatedToProperty = relationship.getRelatedToProperty().get(0);
-        assertEquals(Constants.GENERIC_VNF_VNF_NAME, relatedToProperty.getPropertyKey());
-        assertEquals(TestConstants.GENERIC_VNF_NAME, relatedToProperty.getPropertyValue());
-
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/NodesControllerTest.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/NodesControllerTest.java
deleted file mode 100755
index 378d77df..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/NodesControllerTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.onap.so.aaisimulator.utils.Constants.RESOURCE_LINK;
-import static org.onap.so.aaisimulator.utils.Constants.RESOURCE_TYPE;
-import static org.onap.so.aaisimulator.utils.Constants.SERVICE_RESOURCE_TYPE;
-import static org.onap.so.aaisimulator.utils.TestConstants.CUSTOMERS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.GENERIC_VNFS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.GENERIC_VNF_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.GENERIC_VNF_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_INSTANCE_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_INSTANCE_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_SUBSCRIPTIONS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.VNF_ID;
-import java.io.IOException;
-import java.util.Map;
-import org.junit.After;
-import org.junit.Test;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.GenericVnfs;
-import org.onap.aai.domain.yang.ServiceInstance;
-import org.onap.so.aaisimulator.models.Format;
-import org.onap.so.aaisimulator.models.Results;
-import org.onap.so.aaisimulator.service.providers.CustomerCacheServiceProvider;
-import org.onap.so.aaisimulator.service.providers.NodesCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.TestConstants;
-import org.onap.so.aaisimulator.utils.TestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public class NodesControllerTest extends AbstractSpringBootTest {
-
-    @Autowired
-    private NodesCacheServiceProvider nodesCacheServiceProvider;
-
-    @Autowired
-    private CustomerCacheServiceProvider customerCacheServiceProvider;
-
-    @After
-    public void after() {
-        nodesCacheServiceProvider.clearAll();
-        customerCacheServiceProvider.clearAll();
-    }
-
-    @Test
-    public void test_getNodesSericeInstance_usingServiceInstanceId_ableToRetrieveServiceInstanceFromCache()
-            throws Exception {
-
-        invokeCustomerandServiceInstanceUrls();
-
-        final ResponseEntity<ServiceInstance> actual = testRestTemplateService
-                .invokeHttpGet(getUrl(TestConstants.NODES_URL, SERVICE_INSTANCE_URL), ServiceInstance.class);
-
-        assertEquals(HttpStatus.OK, actual.getStatusCode());
-        assertTrue(actual.hasBody());
-
-        final ServiceInstance actualServiceInstance = actual.getBody();
-
-        assertEquals(SERVICE_NAME, actualServiceInstance.getServiceInstanceName());
-        assertEquals(SERVICE_INSTANCE_ID, actualServiceInstance.getServiceInstanceId());
-
-    }
-
-    @Test
-    public void test_getNodesSericeInstance_usingServiceInstanceIdAndFormatPathed_ableToRetrieveServiceInstanceFromCache()
-            throws Exception {
-
-        invokeCustomerandServiceInstanceUrls();
-
-        final ResponseEntity<Results> actual = testRestTemplateService.invokeHttpGet(
-                getUrl(TestConstants.NODES_URL, SERVICE_INSTANCE_URL) + "?format=" + Format.PATHED.getValue(),
-                Results.class);
-
-        assertEquals(HttpStatus.OK, actual.getStatusCode());
-        assertTrue(actual.hasBody());
-
-        final Results result = actual.getBody();
-
-        assertNotNull(result.getValues());
-        assertFalse(result.getValues().isEmpty());
-        final Map<String, Object> actualMap = result.getValues().get(0);
-
-        assertEquals(CUSTOMERS_URL + SERVICE_SUBSCRIPTIONS_URL + SERVICE_INSTANCE_URL, actualMap.get(RESOURCE_LINK));
-        assertEquals(SERVICE_RESOURCE_TYPE, actualMap.get(RESOURCE_TYPE));
-
-    }
-
-    @Test
-    public void test_getNodesGenericVnfs_usingVnfName_ableToRetrieveItFromCache() throws Exception {
-        invokeCustomerandServiceInstanceUrls();
-
-        final String genericVnfUrl = getUrl(GENERIC_VNF_URL, VNF_ID);
-        final ResponseEntity<Void> genericVnfResponse =
-                testRestTemplateService.invokeHttpPut(genericVnfUrl, TestUtils.getGenericVnf(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, genericVnfResponse.getStatusCode());
-
-        final String nodeGenericVnfsUrl =
-                getUrl(TestConstants.NODES_URL, GENERIC_VNFS_URL) + "?vnf-name=" + GENERIC_VNF_NAME;
-
-        final ResponseEntity<GenericVnfs> actual =
-                testRestTemplateService.invokeHttpGet(nodeGenericVnfsUrl, GenericVnfs.class);
-
-        assertEquals(HttpStatus.OK, actual.getStatusCode());
-        assertTrue(actual.hasBody());
-
-        final GenericVnfs genericVnfs = actual.getBody();
-        assertEquals(1, genericVnfs.getGenericVnf().size());
-
-        final GenericVnf genericVnf = genericVnfs.getGenericVnf().get(0);
-        assertEquals(GENERIC_VNF_NAME, genericVnf.getVnfName());
-        assertEquals(VNF_ID, genericVnf.getVnfId());
-
-    }
-
-    private void invokeCustomerandServiceInstanceUrls() throws Exception, IOException {
-        final String url = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
-
-        final ResponseEntity<Void> response =
-                testRestTemplateService.invokeHttpPut(getUrl(CUSTOMERS_URL), TestUtils.getCustomer(), Void.class);
-
-        assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
-
-        final ResponseEntity<Void> response2 =
-                testRestTemplateService.invokeHttpPut(url, TestUtils.getServiceInstance(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, response2.getStatusCode());
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/OwningEntityControllerTest.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/OwningEntityControllerTest.java
deleted file mode 100755
index 015994a5..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/OwningEntityControllerTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.onap.so.aaisimulator.utils.Constants.RELATIONSHIP_LIST_RELATIONSHIP_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.CUSTOMERS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.GLOBAL_CUSTOMER_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_INSTANCE_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_INSTANCE_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_SUBSCRIPTIONS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_TYPE;
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-import org.junit.After;
-import org.junit.Test;
-import org.onap.aai.domain.yang.OwningEntity;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.ServiceInstance;
-import org.onap.so.aaisimulator.models.Format;
-import org.onap.so.aaisimulator.models.Results;
-import org.onap.so.aaisimulator.service.providers.CustomerCacheServiceProvider;
-import org.onap.so.aaisimulator.service.providers.OwnEntityCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.Constants;
-import org.onap.so.aaisimulator.utils.TestConstants;
-import org.onap.so.aaisimulator.utils.TestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public class OwningEntityControllerTest extends AbstractSpringBootTest {
-
-    private static final String OWN_ENTITY_ID_VALUE = "oe_1";
-    private static final String OWN_ENTITY_NAME_VALUE = "oe_2";
-
-    @Autowired
-    private OwnEntityCacheServiceProvider cacheServiceProvider;
-
-    @Autowired
-    private CustomerCacheServiceProvider customerCacheServiceProvider;
-
-    @After
-    public void after() {
-        cacheServiceProvider.clearAll();
-        customerCacheServiceProvider.clearAll();
-    }
-
-    @Test
-    public void test_putOwningEntity_successfullyAddedToCache() throws Exception {
-        final String url = getUrl(TestConstants.OWNING_ENTITY_URL, OWN_ENTITY_ID_VALUE);
-        final ResponseEntity<Void> actual =
-                testRestTemplateService.invokeHttpPut(url, TestUtils.getOwningEntity(), Void.class);
-
-        assertEquals(HttpStatus.ACCEPTED, actual.getStatusCode());
-
-        final ResponseEntity<OwningEntity> actualResponse =
-                testRestTemplateService.invokeHttpGet(url, OwningEntity.class);
-
-        assertEquals(HttpStatus.OK, actualResponse.getStatusCode());
-        assertTrue(actualResponse.hasBody());
-        final OwningEntity actualOwningEntity = actualResponse.getBody();
-        assertEquals(OWN_ENTITY_ID_VALUE, actualOwningEntity.getOwningEntityId());
-        assertEquals(OWN_ENTITY_NAME_VALUE, actualOwningEntity.getOwningEntityName());
-        assertNotNull(actualOwningEntity.getResourceVersion());
-
-    }
-
-    @Test
-    public void test_getOwningEntityCount_correctResult() throws Exception {
-        final String url = getUrl(TestConstants.OWNING_ENTITY_URL, OWN_ENTITY_ID_VALUE);
-        final ResponseEntity<Void> actual =
-                testRestTemplateService.invokeHttpPut(url, TestUtils.getOwningEntity(), Void.class);
-
-        assertEquals(HttpStatus.ACCEPTED, actual.getStatusCode());
-
-        final ResponseEntity<Results> actualResponse = testRestTemplateService
-                .invokeHttpGet(url + "?resultIndex=0&resultSize=1&format=" + Format.COUNT.getValue(), Results.class);
-
-        assertEquals(HttpStatus.OK, actualResponse.getStatusCode());
-        assertTrue(actualResponse.hasBody());
-        final Results result = actualResponse.getBody();
-        assertNotNull(result.getValues());
-        assertFalse(result.getValues().isEmpty());
-        assertEquals(1, result.getValues().get(0).get(Constants.OWNING_ENTITY));
-    }
-
-    @Test
-    public void test_putOwningEntityRelationShip_successfullyAddedToCache() throws Exception {
-        addCustomerAndServiceInstance();
-
-        final String url = getUrl(TestConstants.OWNING_ENTITY_URL, OWN_ENTITY_ID_VALUE);
-        final ResponseEntity<Void> actual =
-                testRestTemplateService.invokeHttpPut(url, TestUtils.getOwningEntity(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, actual.getStatusCode());
-
-        final String owningEntityRelationshipUrl = url + RELATIONSHIP_LIST_RELATIONSHIP_URL;
-
-        final ResponseEntity<Void> putResponse = testRestTemplateService.invokeHttpPut(owningEntityRelationshipUrl,
-                TestUtils.getOwningEntityRelationship(), Void.class);
-
-        assertEquals(HttpStatus.ACCEPTED, putResponse.getStatusCode());
-
-        final ResponseEntity<OwningEntity> actualResponse =
-                testRestTemplateService.invokeHttpGet(url, OwningEntity.class);
-
-        assertEquals(HttpStatus.OK, actualResponse.getStatusCode());
-        assertTrue(actualResponse.hasBody());
-        final OwningEntity actualOwningEntity = actualResponse.getBody();
-        assertEquals(OWN_ENTITY_ID_VALUE, actualOwningEntity.getOwningEntityId());
-        assertEquals(OWN_ENTITY_NAME_VALUE, actualOwningEntity.getOwningEntityName());
-        assertNotNull(actualOwningEntity.getRelationshipList());
-        assertFalse(actualOwningEntity.getRelationshipList().getRelationship().isEmpty());
-        assertNotNull(actualOwningEntity.getRelationshipList().getRelationship().get(0));
-
-        final Relationship actualRelationship = actualOwningEntity.getRelationshipList().getRelationship().get(0);
-        final List<RelationshipData> relationshipDataList = actualRelationship.getRelationshipData();
-        assertEquals(Constants.BELONGS_TO, actualRelationship.getRelationshipLabel());
-        assertFalse(relationshipDataList.isEmpty());
-        assertEquals(3, relationshipDataList.size());
-
-        final RelationshipData globalRelationshipData =
-                getRelationshipData(relationshipDataList, Constants.CUSTOMER_GLOBAL_CUSTOMER_ID);
-        assertNotNull(globalRelationshipData);
-        assertEquals(GLOBAL_CUSTOMER_ID, globalRelationshipData.getRelationshipValue());
-
-        final RelationshipData serviceSubscriptionRelationshipData =
-                getRelationshipData(relationshipDataList, Constants.SERVICE_SUBSCRIPTION_SERVICE_TYPE);
-        assertNotNull(serviceSubscriptionRelationshipData);
-        assertEquals(SERVICE_TYPE, serviceSubscriptionRelationshipData.getRelationshipValue());
-
-        final RelationshipData serviceInstanceRelationshipData =
-                getRelationshipData(relationshipDataList, Constants.SERVICE_INSTANCE_SERVICE_INSTANCE_ID);
-        assertNotNull(serviceInstanceRelationshipData);
-        assertEquals(SERVICE_INSTANCE_ID, serviceInstanceRelationshipData.getRelationshipValue());
-
-        final Optional<ServiceInstance> optional =
-                customerCacheServiceProvider.getServiceInstance(GLOBAL_CUSTOMER_ID, SERVICE_TYPE, SERVICE_INSTANCE_ID);
-        assertTrue(optional.isPresent());
-
-        final ServiceInstance serviceInstance = optional.get();
-
-        assertNotNull(serviceInstance.getRelationshipList());
-        final List<Relationship> serviceRelationshipList = serviceInstance.getRelationshipList().getRelationship();
-        assertFalse(serviceRelationshipList.isEmpty());
-        assertEquals(1, serviceRelationshipList.size());
-        final Relationship relationship = serviceRelationshipList.get(0);
-        assertEquals(Constants.BELONGS_TO, relationship.getRelationshipLabel());
-        assertEquals(TestConstants.OWNING_ENTITY_URL + OWN_ENTITY_ID_VALUE, relationship.getRelatedLink());
-
-        final List<RelationshipData> serviceRelationshipDataList = serviceRelationshipList.get(0).getRelationshipData();
-        assertFalse(serviceRelationshipDataList.isEmpty());
-        assertEquals(1, serviceRelationshipDataList.size());
-
-        final RelationshipData owningEntityRelationshipData =
-                getRelationshipData(serviceRelationshipDataList, Constants.OWNING_ENTITY_OWNING_ENTITY_ID);
-        assertNotNull(owningEntityRelationshipData);
-        assertEquals(OWN_ENTITY_ID_VALUE, owningEntityRelationshipData.getRelationshipValue());
-
-    }
-
-    private void addCustomerAndServiceInstance() throws Exception, IOException {
-        final ResponseEntity<Void> customerResponse =
-                testRestTemplateService.invokeHttpPut(getUrl(CUSTOMERS_URL), TestUtils.getCustomer(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, customerResponse.getStatusCode());
-
-        final String serviceInstanceUrl = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
-        final ResponseEntity<Void> serviceInstanceResponse =
-                testRestTemplateService.invokeHttpPut(serviceInstanceUrl, TestUtils.getServiceInstance(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, serviceInstanceResponse.getStatusCode());
-
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PlatformControllerTest.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PlatformControllerTest.java
deleted file mode 100755
index 7e88eec5..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PlatformControllerTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.onap.so.aaisimulator.utils.Constants.BI_DIRECTIONAL_RELATIONSHIP_LIST_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.GENERIC_VNF_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.PLATFORM_NAME;
-import static org.onap.so.aaisimulator.utils.TestConstants.VNF_ID;
-import java.util.List;
-import java.util.Optional;
-import org.junit.After;
-import org.junit.Test;
-import org.onap.aai.domain.yang.Platform;
-import org.onap.aai.domain.yang.RelatedToProperty;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.so.aaisimulator.models.Format;
-import org.onap.so.aaisimulator.models.Results;
-import org.onap.so.aaisimulator.service.providers.PlatformCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.Constants;
-import org.onap.so.aaisimulator.utils.TestConstants;
-import org.onap.so.aaisimulator.utils.TestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public class PlatformControllerTest extends AbstractSpringBootTest {
-
-    @Autowired
-    private PlatformCacheServiceProvider platformCacheServiceProvider;
-
-    @After
-    public void after() {
-        platformCacheServiceProvider.clearAll();
-    }
-
-    @Test
-    public void test_putPlatform_successfullyAddedToCache() throws Exception {
-
-        final String platformUrl = getUrl(TestConstants.PLATFORMS_URL, PLATFORM_NAME);
-        final ResponseEntity<Void> platformResponse =
-                testRestTemplateService.invokeHttpPut(platformUrl, TestUtils.getPlatform(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, platformResponse.getStatusCode());
-
-        final ResponseEntity<Platform> response = testRestTemplateService.invokeHttpGet(platformUrl, Platform.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-
-        final Platform actualPlatform = response.getBody();
-        assertEquals(PLATFORM_NAME, actualPlatform.getPlatformName());
-        assertNotNull("resource version should not be null", actualPlatform.getResourceVersion());
-
-    }
-
-    @Test
-    public void test_getPlatformWithFormatCount() throws Exception {
-
-        final String platformUrl = getUrl(TestConstants.PLATFORMS_URL, PLATFORM_NAME);
-
-        final ResponseEntity<Void> platformResponse =
-                testRestTemplateService.invokeHttpPut(platformUrl, TestUtils.getPlatform(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, platformResponse.getStatusCode());
-
-        final ResponseEntity<Results> response = testRestTemplateService.invokeHttpGet(
-                platformUrl + "?resultIndex=0&resultSize=1&format=" + Format.COUNT.getValue(), Results.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-
-        final Results result = response.getBody();
-        assertNotNull(result.getValues());
-        assertFalse(result.getValues().isEmpty());
-        assertEquals(1, result.getValues().get(0).get(Constants.PLATFORM));
-
-    }
-
-    @Test
-    public void test_putGenericVnfRelationShipToPlatform_successfullyAddedToCache() throws Exception {
-
-        final String platformUrl = getUrl(TestConstants.PLATFORMS_URL, PLATFORM_NAME);
-        final ResponseEntity<Void> platformResponse =
-                testRestTemplateService.invokeHttpPut(platformUrl, TestUtils.getPlatform(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, platformResponse.getStatusCode());
-
-        final String platformRelationShipUrl =
-                getUrl(TestConstants.PLATFORMS_URL, PLATFORM_NAME, BI_DIRECTIONAL_RELATIONSHIP_LIST_URL);
-
-        final ResponseEntity<Relationship> responseEntity = testRestTemplateService
-                .invokeHttpPut(platformRelationShipUrl, TestUtils.getGenericVnfRelationShip(), Relationship.class);
-        assertEquals(HttpStatus.ACCEPTED, responseEntity.getStatusCode());
-
-        final Optional<Platform> optional = platformCacheServiceProvider.getPlatform(PLATFORM_NAME);
-        assertTrue(optional.isPresent());
-
-        final Platform actual = optional.get();
-
-        assertNotNull(actual.getRelationshipList());
-        final List<Relationship> relationshipList = actual.getRelationshipList().getRelationship();
-        assertFalse("Relationship list should not be empty", relationshipList.isEmpty());
-        final Relationship relationship = relationshipList.get(0);
-
-        assertEquals(GENERIC_VNF_URL + VNF_ID, relationship.getRelatedLink());
-        assertFalse("RelationshipData list should not be empty", relationship.getRelationshipData().isEmpty());
-        assertFalse("RelatedToProperty list should not be empty", relationship.getRelatedToProperty().isEmpty());
-
-        final RelationshipData relationshipData = relationship.getRelationshipData().get(0);
-        assertEquals(Constants.GENERIC_VNF_VNF_ID, relationshipData.getRelationshipKey());
-        assertEquals(TestConstants.VNF_ID, relationshipData.getRelationshipValue());
-
-        final RelatedToProperty relatedToProperty = relationship.getRelatedToProperty().get(0);
-        assertEquals(Constants.GENERIC_VNF_VNF_NAME, relatedToProperty.getPropertyKey());
-        assertEquals(TestConstants.GENERIC_VNF_NAME, relatedToProperty.getPropertyValue());
-
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PnfsControllerTest.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PnfsControllerTest.java
deleted file mode 100755
index 10e9b66f..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PnfsControllerTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import org.junit.After;
-import org.junit.Test;
-import org.onap.aai.domain.yang.v15.Pnf;
-import org.onap.so.aaisimulator.service.providers.PnfCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.TestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-
-/**
- * @author Raj Gumma (raj.gumma@est.tech)
- *
- */
-public class PnfsControllerTest extends AbstractSpringBootTest {
-
-    @Autowired
-    private PnfCacheServiceProvider cacheServiceProvider;
-
-    private final String PNF="test-008";
-    private final String PNF_URL= "/aai/v15/network/pnfs/pnf/";
-
-
-    @After
-    public void after() {
-        cacheServiceProvider.clearAll();
-    }
-
-    @Test
-    public void test_pnf_successfullyAddedToCache() throws Exception {
-
-        final String url = getUrl(PNF_URL, PNF);
-        final ResponseEntity<Void> pnfResponse =
-                testRestTemplateService.invokeHttpPut(url, TestUtils.getPnf(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, pnfResponse.getStatusCode());
-
-        final ResponseEntity<Pnf> response =
-                testRestTemplateService.invokeHttpGet(url, Pnf.class);
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-
-        assertTrue(response.hasBody());
-
-        final Pnf actualPnf = response.getBody();
-        assertEquals("test-008", actualPnf.getPnfName());
-        assertEquals("5f2602dc-f647-4535-8f1d-9ec079e68a49", actualPnf.getPnfId());
-
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ProjectControllerTest.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ProjectControllerTest.java
deleted file mode 100755
index 678d417b..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ProjectControllerTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.onap.so.aaisimulator.utils.Constants.RELATIONSHIP_LIST_RELATIONSHIP_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.CUSTOMERS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.GLOBAL_CUSTOMER_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_INSTANCE_ID;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_INSTANCE_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_SUBSCRIPTIONS_URL;
-import static org.onap.so.aaisimulator.utils.TestConstants.SERVICE_TYPE;
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-import org.junit.After;
-import org.junit.Test;
-import org.onap.aai.domain.yang.Project;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.ServiceInstance;
-import org.onap.so.aaisimulator.models.Results;
-import org.onap.so.aaisimulator.service.providers.CustomerCacheServiceProvider;
-import org.onap.so.aaisimulator.service.providers.ProjectCacheServiceProvider;
-import org.onap.so.aaisimulator.utils.Constants;
-import org.onap.so.aaisimulator.utils.TestConstants;
-import org.onap.so.aaisimulator.utils.TestRestTemplateService;
-import org.onap.so.aaisimulator.utils.TestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public class ProjectControllerTest extends AbstractSpringBootTest {
-
-    private static final String PROJECT_NAME_VALUE = "PROJECT_NAME_VALUE";
-
-    @LocalServerPort
-    private int port;
-
-    @Autowired
-    private TestRestTemplateService testRestTemplateService;
-
-    @Autowired
-    private ProjectCacheServiceProvider cacheServiceProvider;
-
-    @Autowired
-    private CustomerCacheServiceProvider customerCacheServiceProvider;
-
-    @After
-    public void after() {
-        cacheServiceProvider.clearAll();
-        customerCacheServiceProvider.clearAll();
-    }
-
-    @Test
-    public void test_putProject_successfullyAddedToCache() throws Exception {
-        final String url = getUrl(TestConstants.PROJECT_URL, PROJECT_NAME_VALUE);
-        final ResponseEntity<Void> actual =
-                testRestTemplateService.invokeHttpPut(url, TestUtils.getBusinessProject(), Void.class);
-
-        assertEquals(HttpStatus.ACCEPTED, actual.getStatusCode());
-
-        final ResponseEntity<Project> actualResponse = testRestTemplateService.invokeHttpGet(url, Project.class);
-
-        assertEquals(HttpStatus.OK, actualResponse.getStatusCode());
-        assertTrue(actualResponse.hasBody());
-        final Project actualProject = actualResponse.getBody();
-        assertEquals(PROJECT_NAME_VALUE, actualProject.getProjectName());
-        assertNotNull(actualProject.getResourceVersion());
-
-    }
-
-    @Test
-    public void test_putProjectRelationShip_successfullyAddedToCache() throws Exception {
-        addCustomerAndServiceInstance();
-
-        final String url = getUrl(TestConstants.PROJECT_URL, PROJECT_NAME_VALUE);
-        final ResponseEntity<Void> actual =
-                testRestTemplateService.invokeHttpPut(url, TestUtils.getBusinessProject(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, actual.getStatusCode());
-
-        final String projectRelationshipUrl =
-                getUrl(TestConstants.PROJECT_URL, PROJECT_NAME_VALUE, RELATIONSHIP_LIST_RELATIONSHIP_URL);
-
-        final ResponseEntity<Void> putResponse = testRestTemplateService.invokeHttpPut(projectRelationshipUrl,
-                TestUtils.getBusinessProjectRelationship(), Void.class);
-
-        assertEquals(HttpStatus.ACCEPTED, putResponse.getStatusCode());
-
-        final ResponseEntity<Project> actualResponse = testRestTemplateService.invokeHttpGet(url, Project.class);
-
-        assertEquals(HttpStatus.OK, actualResponse.getStatusCode());
-        assertTrue(actualResponse.hasBody());
-        final Project actualProject = actualResponse.getBody();
-        assertEquals(PROJECT_NAME_VALUE, actualProject.getProjectName());
-        assertNotNull(actualProject.getRelationshipList());
-        assertFalse(actualProject.getRelationshipList().getRelationship().isEmpty());
-        assertNotNull(actualProject.getRelationshipList().getRelationship().get(0));
-
-        final Relationship actualRelationship = actualProject.getRelationshipList().getRelationship().get(0);
-        final List<RelationshipData> relationshipDataList = actualRelationship.getRelationshipData();
-        assertEquals(Constants.USES, actualRelationship.getRelationshipLabel());
-
-        assertFalse(relationshipDataList.isEmpty());
-        assertEquals(3, relationshipDataList.size());
-
-        final RelationshipData globalRelationshipData =
-                getRelationshipData(relationshipDataList, Constants.CUSTOMER_GLOBAL_CUSTOMER_ID);
-        assertNotNull(globalRelationshipData);
-        assertEquals(GLOBAL_CUSTOMER_ID, globalRelationshipData.getRelationshipValue());
-
-        final RelationshipData serviceSubscriptionRelationshipData =
-                getRelationshipData(relationshipDataList, Constants.SERVICE_SUBSCRIPTION_SERVICE_TYPE);
-        assertNotNull(serviceSubscriptionRelationshipData);
-        assertEquals(SERVICE_TYPE, serviceSubscriptionRelationshipData.getRelationshipValue());
-
-        final RelationshipData serviceInstanceRelationshipData =
-                getRelationshipData(relationshipDataList, Constants.SERVICE_INSTANCE_SERVICE_INSTANCE_ID);
-        assertNotNull(serviceInstanceRelationshipData);
-        assertEquals(SERVICE_INSTANCE_ID, serviceInstanceRelationshipData.getRelationshipValue());
-
-        final Optional<ServiceInstance> optional =
-                customerCacheServiceProvider.getServiceInstance(GLOBAL_CUSTOMER_ID, SERVICE_TYPE, SERVICE_INSTANCE_ID);
-        assertTrue(optional.isPresent());
-
-        final ServiceInstance serviceInstance = optional.get();
-
-        assertNotNull(serviceInstance.getRelationshipList());
-        final List<Relationship> serviceRelationshipList = serviceInstance.getRelationshipList().getRelationship();
-        assertFalse(serviceRelationshipList.isEmpty());
-        assertEquals(1, serviceRelationshipList.size());
-        final Relationship relationship = serviceRelationshipList.get(0);
-        assertEquals(Constants.USES, relationship.getRelationshipLabel());
-        assertEquals(TestConstants.PROJECT_URL + PROJECT_NAME_VALUE, relationship.getRelatedLink());
-
-
-        final List<RelationshipData> serviceRelationshipDataList = serviceRelationshipList.get(0).getRelationshipData();
-        assertFalse(serviceRelationshipDataList.isEmpty());
-        assertEquals(1, serviceRelationshipDataList.size());
-
-        final RelationshipData projectRelationshipData =
-                getRelationshipData(serviceRelationshipDataList, Constants.PROJECT_PROJECT_NAME);
-        assertNotNull(projectRelationshipData);
-        assertEquals(PROJECT_NAME_VALUE, projectRelationshipData.getRelationshipValue());
-
-    }
-
-    @Test
-    public void test_getProjectCount_correctResult() throws Exception {
-        final String url = getUrl(TestConstants.PROJECT_URL, PROJECT_NAME_VALUE);
-        final ResponseEntity<Void> actual =
-                testRestTemplateService.invokeHttpPut(url, TestUtils.getBusinessProject(), Void.class);
-
-        assertEquals(HttpStatus.ACCEPTED, actual.getStatusCode());
-
-        final ResponseEntity<Results> actualResponse =
-                testRestTemplateService.invokeHttpGet(url + "?resultIndex=0&resultSize=1&format=count", Results.class);
-
-        assertEquals(HttpStatus.OK, actualResponse.getStatusCode());
-        assertTrue(actualResponse.hasBody());
-        final Results result = actualResponse.getBody();
-        assertNotNull(result.getValues());
-        assertFalse(result.getValues().isEmpty());
-        assertEquals(1, result.getValues().get(0).get(Constants.PROJECT));
-    }
-
-
-    private void addCustomerAndServiceInstance() throws Exception, IOException {
-        final ResponseEntity<Void> customerResponse =
-                testRestTemplateService.invokeHttpPut(getUrl(CUSTOMERS_URL), TestUtils.getCustomer(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, customerResponse.getStatusCode());
-
-        final String serviceInstanceUrl = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
-        final ResponseEntity<Void> serviceInstanceResponse =
-                testRestTemplateService.invokeHttpPut(serviceInstanceUrl, TestUtils.getServiceInstance(), Void.class);
-        assertEquals(HttpStatus.ACCEPTED, serviceInstanceResponse.getStatusCode());
-
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/configuration/TestRestTemplateConfigration.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/configuration/TestRestTemplateConfigration.java
deleted file mode 100755
index 92036e83..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/configuration/TestRestTemplateConfigration.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.controller.configuration;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLSession;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.TrustStrategy;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.ssl.SSLContexts;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-@Profile("test")
-@Configuration
-public class TestRestTemplateConfigration {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(TestRestTemplateConfigration.class);
-
-    @Bean
-    public TestRestTemplate testRestTemplate() throws Exception {
-        final TestRestTemplate testRestTemplate = new TestRestTemplate();
-        ((HttpComponentsClientHttpRequestFactory) testRestTemplate.getRestTemplate().getRequestFactory())
-                .setHttpClient(httpClient());
-        return testRestTemplate;
-
-    }
-
-    @Bean
-    public RestTemplate restTemplate() throws Exception {
-        final RestTemplate restTemplate = new RestTemplate();
-        restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory(httpClient()));
-        return restTemplate;
-    }
-
-    private CloseableHttpClient httpClient() throws Exception {
-        final TrustStrategy acceptingTrustStrategy = (cert, authType) -> true;
-
-        final SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(
-                SSLContexts.custom().loadTrustMaterial(null, acceptingTrustStrategy).build(), new HostnameVerifier() {
-                    @Override
-                    public boolean verify(final String hostname, final SSLSession session) {
-                        LOGGER.warn("Skiping hostname verification ... ");
-                        return true;
-                    }
-
-                });
-
-        return HttpClients.custom().setSSLSocketFactory(csf).build();
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestConstants.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestConstants.java
deleted file mode 100755
index 85ceeef3..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestConstants.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.utils;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public class TestConstants {
-
-    public static final String BASE_URL_V17 = "/aai/v17";
-
-    public static final String SERVICE_INSTANCES_URL = "/service-instances";
-
-    public static final String SERVICE_NAME = "ServiceTest";
-
-    public static final String SERVICE_INSTANCE_ID = "ccece8fe-13da-456a-baf6-41b3a4a2bc2b";
-
-    public static final String SERVICE_INSTANCE_URL =
-            SERVICE_INSTANCES_URL + "/service-instance/" + SERVICE_INSTANCE_ID;
-
-    public static final String SERVICE_TYPE = "vCPE";
-
-    public static final String SERVICE_SUBSCRIPTIONS_URL =
-            "/service-subscriptions/service-subscription/" + SERVICE_TYPE;
-
-    public static final String GLOBAL_CUSTOMER_ID = "DemoCustomer";
-
-    public static final String CUSTOMERS_URL = BASE_URL_V17 + "/business/customers/customer/" + GLOBAL_CUSTOMER_ID;
-
-    public static final String VNF_ID = "dfd02fb5-d7fb-4aac-b3c4-cd6b60058701";
-
-    public static final String GENERIC_VNF_NAME = "EsyVnfInstantiationTest2";
-
-    public static final String GENERIC_VNF_URL = BASE_URL_V17 + "/network/generic-vnfs/generic-vnf/";
-
-    public static final String GENERIC_VNFS_URL = "/generic-vnfs";
-
-    public static final String RELATED_TO_URL = "/related-to" + GENERIC_VNFS_URL;
-
-    public static final String PLATFORM_NAME = "PLATFORM_APP_ID_1";
-
-    public static final String LINE_OF_BUSINESS_NAME = "LINE_OF_BUSINESS_1";
-
-    public static final String CLOUD_OWNER_NAME = "CloudOwner";
-
-    public static final String CLOUD_REGION_NAME = "PnfSwUCloudRegion";
-
-    public static final String TENANT_ID = "693c7729b2364a26a3ca602e6f66187d";
-
-    public static final String TENANTS_TENANT = "/tenants/tenant/";
-
-    public static final String ESR_VNFM_URL = BASE_URL_V17 + "/external-system/esr-vnfm-list/esr-vnfm/";
-
-    public static final String EXTERNAL_SYSTEM_ESR_VNFM_LIST_URL = BASE_URL_V17 + "/external-system/esr-vnfm-list";
-
-    public static final String ESR_VNFM_ID = "c5e99cee-1996-4606-b697-838d51d4e1a3";
-
-    public static final String ESR_VIM_ID = "PnfSwUVimId";
-
-    public static final String ESR_SYSTEM_INFO_LIST_URL = "/esr-system-info-list";
-
-    public static final String ESR_SYSTEM_INFO_ID = "5c067098-f2e3-40f7-a7ba-155e7c61e916";
-
-    public static final String ESR_SYSTEM_TYPE = "VNFM";
-
-    public static final String ESR_PASSWORD = "123456";
-
-    public static final String ESR_USERNAME = "vnfmadapter";
-
-    public static final String ESR_SERVICE_URL = "https://so-vnfm-simulator.onap:9095/vnflcm/v1";
-
-    public static final String ESR_VENDOR = "EST";
-
-    public static final String ESR_TYEP = "simulator";
-
-    public static final String SYSTEM_NAME = "vnfmSimulator";
-
-    public static final String VSERVER_URL = "/vservers/vserver/";
-
-    public static final String VSERVER_NAME = "CsitVServer";
-
-    public static final String VSERVER_ID = "f84fdb9b-ad7c-49db-a08f-e443b4cbd033";
-
-    public static final String OWNING_ENTITY_URL = BASE_URL_V17 + "/business/owning-entities/owning-entity/";
-
-    public static final String LINES_OF_BUSINESS_URL = BASE_URL_V17 + "/business/lines-of-business/line-of-business/";
-
-    public static final String PLATFORMS_URL = BASE_URL_V17 + "/business/platforms/platform/";
-
-    public static final String CLOUD_REGIONS = BASE_URL_V17 + "/cloud-infrastructure/cloud-regions/cloud-region/";
-
-    public static final String GENERIC_VNFS_URL_1 = BASE_URL_V17 + "/network/generic-vnfs";
-
-    public static final String NODES_URL = BASE_URL_V17 + "/nodes";
-
-    public static final String PROJECT_URL = BASE_URL_V17 + "/business/projects/project/";
-
-    private TestConstants() {}
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestRestTemplateService.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestRestTemplateService.java
deleted file mode 100755
index e49e6d49..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestRestTemplateService.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.utils;
-
-import org.onap.so.simulator.model.UserCredentials;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-
-@Service
-public class TestRestTemplateService {
-
-    @Autowired
-    private TestRestTemplate restTemplate;
-
-    @Autowired
-    private UserCredentials userCredentials;
-
-
-    public <T> ResponseEntity<T> invokeHttpGet(final String url, final Class<T> clazz) {
-        return restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), clazz);
-    }
-
-    public <T> ResponseEntity<T> invokeHttpPut(final String url, final Object obj, final Class<T> clazz) {
-        final HttpEntity<?> httpEntity = getHttpEntity(obj);
-        return restTemplate.exchange(url, HttpMethod.PUT, httpEntity, clazz);
-    }
-
-    public <T> ResponseEntity<T> invokeHttpDelete(final String url, final Class<T> clazz) {
-        final HttpEntity<?> request = new HttpEntity<>(getHttpHeaders());
-        return restTemplate.exchange(url, HttpMethod.DELETE, request, clazz);
-    }
-
-    public <T> ResponseEntity<T> invokeHttpPost(final String url, final Object obj, final Class<T> clazz) {
-        final HttpEntity<?> httpEntity = getHttpEntity(obj);
-        return restTemplate.exchange(url, HttpMethod.POST, httpEntity, clazz);
-    }
-
-    public <T> ResponseEntity<T> invokeHttpPost(final HttpHeaders headers, final String url, final Object obj,
-            final Class<T> clazz) {
-        final HttpEntity<Object> entity = new HttpEntity<>(obj, headers);
-        return restTemplate.exchange(url, HttpMethod.POST, entity, clazz);
-    }
-
-    private HttpEntity<?> getHttpEntity(final Object obj) {
-        return new HttpEntity<>(obj, getHttpHeaders());
-    }
-
-    public HttpHeaders getHttpHeaders() {
-        return TestUtils.getHttpHeaders(userCredentials.getUsers().iterator().next().getUsername());
-    }
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestUtils.java b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestUtils.java
deleted file mode 100755
index 55eb0ef5..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestUtils.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.aaisimulator.utils;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Base64;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.web.util.UriComponentsBuilder;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
-
-/**
- * @author waqas.ikram@ericsson.com
- *
- */
-public class TestUtils {
-
-    private static final String PASSWORD = "aai.onap.org:demo123456!";
-
-    public static HttpHeaders getHttpHeaders(final String username) {
-        final HttpHeaders requestHeaders = new HttpHeaders();
-        requestHeaders.add("Authorization", getBasicAuth(username));
-        requestHeaders.setContentType(MediaType.APPLICATION_JSON);
-        return requestHeaders;
-    }
-
-    public static File getFile(final String file) throws IOException {
-        return new ClassPathResource(file).getFile();
-    }
-
-    public static String getJsonString(final String file) throws IOException {
-        return new String(Files.readAllBytes(getFile(file).toPath()));
-    }
-
-    public static <T> T getObjectFromFile(final File file, final Class<T> clazz) throws Exception {
-        final ObjectMapper mapper = new ObjectMapper();
-        mapper.registerModule(new JaxbAnnotationModule());
-
-        return mapper.readValue(file, clazz);
-    }
-
-    public static String getBasicAuth(final String username) {
-        return "Basic " + new String(Base64.getEncoder().encodeToString((username + ":" + PASSWORD).getBytes()));
-    }
-
-    public static String getBaseUrl(final int port) {
-        return "https://localhost:" + port;
-    }
-
-    public static String getCustomer() throws Exception, IOException {
-        return getJsonString("test-data/business-customer.json");
-    }
-
-    public static String getServiceSubscription() throws IOException {
-        return getJsonString("test-data/service-subscription.json");
-    }
-
-    public static String getServiceInstance() throws IOException {
-        return getJsonString("test-data/service-instance.json");
-    }
-
-    public static String getGenericVnf() throws IOException {
-        return getJsonString("test-data/generic-vnf.json");
-    }
-
-    public static String getPnf() throws IOException {
-        return getJsonString("test-data/pnf.json");
-    }
-
-    public static String getRelationShip() throws IOException {
-        return getJsonString("test-data/relation-ship.json");
-    }
-
-    public static String getPlatformRelatedLink() throws IOException {
-        return getJsonString("test-data/platform-related-link.json");
-    }
-
-    public static String getLineOfBusinessRelatedLink() throws IOException {
-        return getJsonString("test-data/line-of-business-related-link.json");
-    }
-
-    public static String getPlatform() throws IOException {
-        return getJsonString("test-data/platform.json");
-    }
-
-    public static String getGenericVnfRelationShip() throws IOException {
-        return getJsonString("test-data/generic-vnf-relationship.json");
-    }
-
-    public static String getLineOfBusiness() throws IOException {
-        return getJsonString("test-data/line-of-business.json");
-    }
-
-    public static String getBusinessProject() throws IOException {
-        return getJsonString("test-data/business-project.json");
-    }
-
-    public static String getBusinessProjectRelationship() throws IOException {
-        return getJsonString("test-data/business-project-relation-ship.json");
-    }
-
-    public static String getOwningEntityRelationship() throws IOException {
-        return getJsonString("test-data/owning-entity-relation-ship.json");
-    }
-
-    public static String getOwningEntity() throws IOException {
-        return getJsonString("test-data/owning-entity.json");
-    }
-
-    public static String getOrchStatuUpdateServiceInstance() throws IOException {
-        return getJsonString("test-data/service-instance-orch-status-update.json");
-    }
-
-    public static String getRelationShipJsonObject() throws IOException {
-        return getJsonString("test-data/service-Instance-relationShip.json");
-    }
-
-    public static String getCloudRegion() throws IOException {
-        return getJsonString("test-data/cloud-region.json");
-    }
-
-    public static String getTenant() throws IOException {
-        return getJsonString("test-data/tenant.json");
-    }
-
-    public static String getCloudRegionRelatedLink() throws IOException {
-        return getJsonString("test-data/cloud-region-related-link.json");
-    }
-
-    public static String getGenericVnfRelatedLink() throws IOException {
-        return getJsonString("test-data/generic-vnf-related-link.json");
-    }
-
-    public static String getTenantRelationShip() throws IOException {
-        return getJsonString("test-data/tenant-relationship.json");
-    }
-
-    public static String getGenericVnfOrchStatuUpdate() throws IOException {
-        return getJsonString("test-data/generic-vnf-orch-status-update.json");
-    }
-
-    public static String getEsrVnfm() throws IOException {
-        return getJsonString("test-data/esr-vnfm.json");
-    }
-
-    public static String getEsrSystemInfo() throws IOException {
-        return getJsonString("test-data/esr-system-info.json");
-    }
-
-    public static String getVserver() throws IOException {
-        return getJsonString("test-data/vServer.json");
-    }
-
-
-    public static String getUrl(final int port, final String... urls) {
-        final UriComponentsBuilder baseUri = UriComponentsBuilder.fromUriString("https://localhost:" + port);
-        for (final String url : urls) {
-            baseUri.path(url);
-        }
-        return baseUri.toUriString();
-    }
-
-    private TestUtils() {}
-
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-customer.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-customer.json
deleted file mode 100755
index 6c53c056..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-customer.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "global-customer-id": "DemoCustomer",
-    "subscriber-name": "DemoCustomer",
-    "subscriber-type": "INFRA",
-    "service-subscriptions": {
-        "service-subscription": [
-            {
-                "service-type": "vLB",
-                "relationship-list": {
-                    "relationship": [
-                        {
-                            "related-to": "tenant",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/xyzcloud/tenants/tenant/693c7729b2364a26a3ca602e6f66187d",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "cloud-region.cloud-owner",
-                                    "relationship-value": "CloudOwner"
-                                },
-                                {
-                                    "relationship-key": "cloud-region.cloud-region-id",
-                                    "relationship-value": "xyzcloud"
-                                },
-                                {
-                                    "relationship-key": "tenant.tenant-id",
-                                    "relationship-value": "693c7729b2364a26a3ca602e6f66187d"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "tenant.tenant-name",
-                                    "property-value": "admin"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            },
-            {
-                "service-type": "vCPE",
-                "relationship-list": {
-                    "relationship": [
-                        {
-                            "related-to": "tenant",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/xyzcloud/tenants/tenant/693c7729b2364a26a3ca602e6f66187d",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "cloud-region.cloud-owner",
-                                    "relationship-value": "CloudOwner"
-                                },
-                                {
-                                    "relationship-key": "cloud-region.cloud-region-id",
-                                    "relationship-value": "xyzcloud"
-                                },
-                                {
-                                    "relationship-key": "tenant.tenant-id",
-                                    "relationship-value": "693c7729b2364a26a3ca602e6f66187d"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "tenant.tenant-name",
-                                    "property-value": "admin"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            }
-        ]
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project-relation-ship.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project-relation-ship.json
deleted file mode 100755
index c2662266..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project-relation-ship.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "related-link": "/business/customers/customer/DemoCustomer/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/ccece8fe-13da-456a-baf6-41b3a4a2bc2b"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project.json
deleted file mode 100755
index f78ddfaf..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "project-name": "PROJECT_NAME_VALUE"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region-related-link.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region-related-link.json
deleted file mode 100755
index f6bf992d..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region-related-link.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "related-link": "/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/PnfSwUCloudRegion"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region.json
deleted file mode 100755
index fa328408..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "cloud-owner": "CloudOwner",
-    "cloud-region-id": "PnfSwUCloudRegion",
-    "cloud-type": "openstack",
-    "owner-defined-type": "OwnerType",
-    "cloud-region-version": "1.0",
-    "cloud-zone": "CloudZone",
-    "complex-name": "clli1",
-    "cloud-extra-info": ""
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-system-info.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-system-info.json
deleted file mode 100755
index 65d6095c..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-system-info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "esr-system-info-id": "5c067098-f2e3-40f7-a7ba-155e7c61e916",
-    "system-name": "vnfmSimulator",
-    "type": "simulator",
-    "vendor": "EST",
-    "version": "V1.0",
-    "service-url": "https://so-vnfm-simulator.onap:9095/vnflcm/v1",
-    "user-name": "vnfmadapter",
-    "password": "123456",
-    "system-type": "VNFM",
-    "resource-version": "1564774459055"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-vnfm.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-vnfm.json
deleted file mode 100755
index 52395273..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-vnfm.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "vnfm-id": "c5e99cee-1996-4606-b697-838d51d4e1a3",
-    "vim-id": "PnfSwUVimId",
-    "certificate-url": ""
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-orch-status-update.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-orch-status-update.json
deleted file mode 100755
index 2c00ea3a..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-orch-status-update.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "vnf-id": "dfd02fb5-d7fb-4aac-b3c4-cd6b60058701",
-    "orchestration-status": "Assigned"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-related-link.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-related-link.json
deleted file mode 100755
index 388773b7..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-related-link.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "related-link": "/network/generic-vnfs/generic-vnf/dfd02fb5-d7fb-4aac-b3c4-cd6b60058701"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-relationship.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-relationship.json
deleted file mode 100755
index 25f317a5..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-relationship.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "related-to": "generic-vnf",
-    "relationship-label": "org.onap.relationships.inventory.Uses",
-    "related-link": "/aai/v17/network/generic-vnfs/generic-vnf/dfd02fb5-d7fb-4aac-b3c4-cd6b60058701",
-    "relationship-data": [{
-        "relationship-key": "generic-vnf.vnf-id",
-        "relationship-value": "dfd02fb5-d7fb-4aac-b3c4-cd6b60058701"
-    }],
-    "related-to-property": [{
-        "property-key": "generic-vnf.vnf-name",
-        "property-value": "EsyVnfInstantiationTest2"
-    }]
-}
\ No newline at end of file
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf.json
deleted file mode 100755
index 3740ce12..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "vnf-id": "dfd02fb5-d7fb-4aac-b3c4-cd6b60058701",
-    "vnf-name": "EsyVnfInstantiationTest2",
-    "vnf-type": "Sol004Zip4Service/Sol004Zip3VSP 0",
-    "service-id": "f13844f4-dbf8-4d0e-a979-45204f3ddb4e",
-    "prov-status": "PREPROV",
-    "orchestration-status": "Inventoried",
-    "model-invariant-id": "b0f14066-2b65-40d2-b5a4-c8f2116fb5fc",
-    "model-version-id": "84b9649a-4eb9-4967-9abe-e8702f55518b",
-    "model-customization-id": "50a90cd7-a84e-4ee1-b5ba-bfa5a26f5e15",
-    "nf-type": "vnflcm",
-    "nf-role": "vnflcm",
-    "selflink": "http://localhost:9921/generic-vnf/dfd02fb5-d7fb-4aac-b3c4-cd6b60058701"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business-related-link.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business-related-link.json
deleted file mode 100755
index 5ec5e9f0..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business-related-link.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "related-link": "/business/lines-of-business/line-of-business/LINE_OF_BUSINESS_1"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business.json
deleted file mode 100755
index 61746a24..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "line-of-business-name": "LINE_OF_BUSINESS_1"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity-relation-ship.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity-relation-ship.json
deleted file mode 100755
index c2662266..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity-relation-ship.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "related-link": "/business/customers/customer/DemoCustomer/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/ccece8fe-13da-456a-baf6-41b3a4a2bc2b"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity.json
deleted file mode 100755
index 7248d41d..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "owning-entity-id": "oe_1",
-    "owning-entity-name": "oe_2"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform-related-link.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform-related-link.json
deleted file mode 100755
index 6e0de8ec..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform-related-link.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "related-link": "/business/platforms/platform/PLATFORM_APP_ID_1"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform.json
deleted file mode 100755
index d94f2f02..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "platform-name": "PLATFORM_APP_ID_1"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/pnf.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/pnf.json
deleted file mode 100755
index fdd865d3..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/pnf.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "pnf-name2":"example-pnf-name2-val-78244",
-  "pnf-name2-source":"example-pnf-name2-source-val-99275",
-  "equip-type":"example-equip-type-val-20348",
-  "equip-vendor":"example-equip-vendor-val-52182",
-  "equip-model":"example-equip-model-val-8370",
-  "management-option":"example-management-option-val-72881",
-  "ipaddress-v4-oam":"10.12.25.73",
-  "ipaddress-v6-oam":"x:x:x:x:x:X",
-  "target-software-version":"xxxxXXX",
-  "pnf-name":"test-008",
-  "pnf-id":"5f2602dc-f647-4535-8f1d-9ec079e68a49",
-  "in-maint":false,
-  "resource-version":"1570117118905",
-  "selflink": "http://localhost:9921/pnf/test-008"
-}
\ No newline at end of file
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/relation-ship.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/relation-ship.json
deleted file mode 100755
index c2662266..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/relation-ship.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "related-link": "/business/customers/customer/DemoCustomer/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/ccece8fe-13da-456a-baf6-41b3a4a2bc2b"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-Instance-relationShip.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-Instance-relationShip.json
deleted file mode 100755
index ab643d3c..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-Instance-relationShip.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "related-to": "generic-vnf",
-    "relationship-label": "org.onap.relationships.inventory.ComposedOf",
-    "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/dfd02fb5-d7fb-4aac-b3c4-cd6b60058701",
-    "relationship-data": [{
-        "relationship-key": "generic-vnf.vnf-id",
-        "relationship-value": "dfd02fb5-d7fb-4aac-b3c4-cd6b60058701"
-    }],
-    "related-to-property": [{
-        "property-key": "generic-vnf.vnf-name",
-        "property-value": "EsyVnfInstantiationTest2"
-    }]
-}
\ No newline at end of file
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance-orch-status-update.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance-orch-status-update.json
deleted file mode 100755
index 5cd566a6..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance-orch-status-update.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service-instance-id": "ccece8fe-13da-456a-baf6-41b3a4a2bc2b",
-    "service-instance-name": "ServiceTest",
-    "orchestration-status": "Active"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance.json
deleted file mode 100755
index 18ae8cb6..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "service-instance-id": "ccece8fe-13da-456a-baf6-41b3a4a2bc2b",
-    "service-instance-name": "ServiceTest",
-    "environment-context": "General_Revenue-Bearing",
-    "workload-context": "Production",
-    "model-invariant-id": "e9acd081-9c89-4b4d-bcb3-e0e2b9715b2a",
-    "model-version-id": "c112a499-6148-488b-ba82-3f5938cf26d2",
-    "orchestration-status": "Inventoried"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-subscription.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-subscription.json
deleted file mode 100755
index e1b4f4f4..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-subscription.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "service-type": "Firewall"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant-relationship.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant-relationship.json
deleted file mode 100755
index eb96c8c3..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant-relationship.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "related-to": "tenant",
-    "relationship-label": "org.onap.relationships.inventory.BelongsTo",
-    "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/PnfSwUCloudRegion/tenants/tenant/693c7729b2364a26a3ca602e6f66187d",
-    "relationship-data": [
-        {
-            "relationship-key": "cloud-region.cloud-owner",
-            "relationship-value": "CloudOwner"
-        },
-        {
-            "relationship-key": "cloud-region.cloud-region-id",
-            "relationship-value": "PnfSwUCloudRegion"
-        },
-        {
-            "relationship-key": "tenant.tenant-id",
-            "relationship-value": "693c7729b2364a26a3ca602e6f66187d"
-        }
-    ],
-    "related-to-property": [
-        {
-            "property-key": "tenant.tenant-name",
-            "property-value": "admin"
-        }
-    ]
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant.json
deleted file mode 100755
index 746131a6..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tenant-id": "693c7729b2364a26a3ca602e6f66187d",
-    "tenant-name": "admin"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/vServer.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/vServer.json
deleted file mode 100755
index 5fa1843e..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/vServer.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "vserver-id": "f84fdb9b-ad7c-49db-a08f-e443b4cbd033",
-    "vserver-name": "CsitVServer",
-    "prov-status": "active",
-    "relationship-list": {
-        "relationship": [
-            {
-                "related-to": "generic-vnf",
-                "relationship-label": "tosca.relationships.HostedOn",
-                "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/dfd02fb5-d7fb-4aac-b3c4-cd6b60058701",
-                "relationship-data": [
-                    {
-                        "relationship-key": "generic-vnf.vnf-id",
-                        "relationship-value": "58157d7e-d50d-4a7d-aebe-ae6e41ca1d9f"
-                    }
-                ],
-                "related-to-property": [
-                    {
-                        "property-key": "generic-vnf.vnf-name",
-                        "property-value": "Test"
-                    }
-                ]
-            }
-        ]
-    }
-}