50 files changed, 0 insertions, 12180 deletions
diff --git a/ms/generic-resource-api/src/main/dc/docker-compose.yaml b/ms/generic-resource-api/src/main/dc/docker-compose.yaml
deleted file mode 100755
index 37a5807..0000000
--- a/ms/generic-resource-api/src/main/dc/docker-compose.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-version: '2.1'
-
-services:
-  db:
-    image: mariadb:10.5
-    container_name: gra_db
-    ports:
-      - "13306:3306"
-    environment:
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-      - MYSQL_ROOT_HOST=%
-      - MYSQL_USER=${MYSQL_USER}
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-      - MYSQL_DATABASE=${MYSQL_DATABASE}
-    logging:       
-      driver:   "json-file"
-      options:  
-        max-size: "30m"
-        max-file: "5"
-  
-      
-  gra:
-    image: onap/sdnc-gra-image:latest
-    depends_on:
-      - db
-    container_name: gra_controller
-    ports:
-      - "8181:8080"
-      - "8443:8443"
-    links:
-      - db:dbhost
-    environment:
-      - MYSQL_DB_HOST=dbhost
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-      - MYSQL_USER=${MYSQL_USER}
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-      - MYSQL_DATABASE=${MYSQL_DATABASE}
-      - SDNC_CONFIG_DIR=/opt/onap/sdnc/config
-      - LOG_LEVEL=INFO
-      - TRUSTSTORE_PASSWORD=changeit
-      - CACERT_PASSWORD=changeit
-      - SDNC_CERT_DIR=/opt/onap/sdnc/config
-      - JAVA_SECURITY_DIR=/usr/lib/jvm/default-jvm/jre/lib/security
-      - TRUSTSTORE=truststoreONAPall.jks
-    logging:       
-      driver:   "json-file"
-      options:  
-        max-size: "30m"
-        max-file: "5"
-    extra_hosts:
-      aaf-onap-test.osaaf.org: 10.12.5.145
-
-  dgbuilder:
-    image: onap/ccsdk-dgbuilder-image:latest
-    depends_on:
-      - db
-    container_name:  gra_dgbuilder
-    entrypoint:
-       - "/bin/bash"
-       - "-c"
-       - "cd /opt/onap/ccsdk/dgbuilder/ && ./start.sh sdnc1.0 && wait"
-    ports:
-      - "3200:3100"
-    volumes:
-      - ${HOME}/gerrit/sdnc/oam/platform-logic:/opt/onap/ccsdk/platform-logic
-    links:
-      - db:dbhost
-      - db:sdnctldb01
-      - db:sdnctldb02
-    environment:
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-      - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
-      - MYSQL_USER=${MYSQL_USER}
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-      - MYSQL_DATABASE=${MYSQL_DATABASE}
-    logging:       
-      driver:   "json-file"
-      options:  
-        max-size: "30m"
-        max-file: "5"
diff --git a/ms/generic-resource-api/src/main/docker/Dockerfile b/ms/generic-resource-api/src/main/docker/Dockerfile
deleted file mode 100644
index 79dda69..0000000
--- a/ms/generic-resource-api/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Prepare stage for multistage image build
-## START OF STAGE0 ##
-FROM @base.image.name@:@ccsdk.docker.version@ AS stage0
-
-ENV LOG_PATH /var/log/onap/sdnc
-USER root
-
-# copy deliverables to opt
-COPY opt /opt
-
-## END OF STAGE0 ##
-
-
-FROM @base.image.name@:@ccsdk.docker.version@
-
-MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
-
-ENV PROJECT_VERSION @project.version@
-ENV SDNC_HOME /opt/onap/sdnc
-ENV SDNC_CONFIG_DIR /opt/onap/sdnc/config
-ENV GRA_JAR @sdnc.gra.jar@
-ENV SVCLOGIC_PROPERTIES /opt/onap/sdnc/config/svclogic.properties
-ENV SVCLOGIC_DIR /opt/onap/sdnc/svclogic/graphs
-ENV LOG_PATH /var/log/onap/sdnc
-
-USER root
-
-# Install sudo and IP utilities
-RUN apk update && apk --no-cache add sudo iputils openssl
-
-
-# Enable wheel group
-RUN sed -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' -i /etc/sudoers
-
-# Create sdnc user
-RUN addgroup -S sdnc && adduser -S sdnc -G sdnc
-RUN addgroup sdnc wheel
-
-COPY --from=stage0 --chown=sdnc:sdnc /opt /opt
-RUN mkdir -p ${LOG_PATH} && chown sdnc:sdnc ${LOG_PATH}
-RUN chmod +x ${SDNC_HOME}/bin/*.sh
-
-
-USER sdnc
-WORKDIR ${SDNC_HOME}
-ENTRYPOINT /opt/onap/sdnc/bin/startGra.sh
-EXPOSE 8443 8080
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/FilterConfiguration.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/FilterConfiguration.java
deleted file mode 100644
index 6b96541..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/FilterConfiguration.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.onap.sdnc.apps.ms.gra;
-
-import org.onap.aaf.cadi.filter.CadiFilter;
-import org.onap.ccsdk.apps.filters.ContentTypeFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
-
-@Configuration
-public class FilterConfiguration {
-
-    private static final Logger log = LoggerFactory.getLogger(FilterConfiguration.class);
-
-	@Bean
-	@Order(1)
-	public FilterRegistrationBean<CadiFilter> cadiFilter() {
-		CadiFilter filter = new CadiFilter();
-
-		FilterRegistrationBean<CadiFilter> registrationBean = new FilterRegistrationBean<>();
-		registrationBean.setFilter(filter);
-		if ("none".equals(System.getProperty("cadi_prop_files", "none"))) {
-            log.info("cadi_prop_files undefined, AAF CADI disabled");
-			registrationBean.addUrlPatterns("/xxxx/*");
-		} else {
-			registrationBean.addUrlPatterns("/*");
-			registrationBean.addInitParameter("cadi_prop_files", System.getProperty("cadi_prop_files"));
-		}
-
-		return registrationBean;
-	}
-
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsApp.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsApp.java
deleted file mode 100644
index d436d21..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsApp.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdnc.apps.ms.gra;
-
-import org.onap.ccsdk.apps.ms.sliboot.controllers.RestconfApiController;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.context.annotation.Import;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-@SpringBootApplication(scanBasePackages = { "org.onap.sdnc.apps.ms.gra", "org.onap.ccsdk.apps.services" })
-@EnableJpaRepositories(basePackages = { "org.onap.sdnc.apps.ms.gra", "org.onap.ccsdk.apps.ms.sliboot" })
-@EntityScan(basePackages = { "org.onap.sdnc.apps.ms.gra", "org.onap.ccsdk.apps.ms.sliboot" })
-@EnableTransactionManagement
-@Import(RestconfApiController.class)
-@EnableSwagger2
-
-public class GenericResourceMsApp {
-
-    private static final Logger log = LoggerFactory.getLogger(GenericResourceMsApp.class);
-
-    public static void main(String[] args) throws Exception {
-        SpringApplication.run(GenericResourceMsApp.class, args);
-    }
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiController.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiController.java
deleted file mode 100644
index 7508eb8..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiController.java
+++ /dev/null
@@ -1,1969 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdnc.apps.ms.gra.controllers;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.onap.ccsdk.apps.services.RestApplicationException;
-import org.onap.ccsdk.apps.services.RestException;
-import org.onap.ccsdk.apps.services.RestProtocolException;
-import org.onap.sdnc.apps.ms.gra.controllers.ServiceDataHelper.ServiceDataTransaction;
-import org.onap.sdnc.apps.ms.gra.data.ConfigContrailRouteAllottedResources;
-import org.onap.sdnc.apps.ms.gra.data.ConfigContrailRouteAllottedResourcesRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigNetworksRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigPortMirrorConfigurations;
-import org.onap.sdnc.apps.ms.gra.data.ConfigPortMirrorConfigurationsRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigPreloadData;
-import org.onap.sdnc.apps.ms.gra.data.ConfigPreloadDataRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigServices;
-import org.onap.sdnc.apps.ms.gra.data.ConfigServicesRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigVfModules;
-import org.onap.sdnc.apps.ms.gra.data.ConfigVfModulesRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigVnfsRepository;
-import org.onap.sdnc.apps.ms.gra.swagger.ConfigApi;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiContrailrouteallottedresourcesContrailRouteAllottedResource;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiContrailrouteallottedresourcesContrailrouteallottedresourceAllottedResourceData;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiContrailroutetopologyContrailRouteTopology;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiOnapmodelinformationOnapModelInformation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiOperStatusData;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPortmirrorconfigurationsPortMirrorConfiguration;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPortmirrorconfigurationsPortmirrorconfigurationConfigurationData;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPortmirrorconfigurationtopologyPortMirrorConfigurationTopology;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPreloadModelInformation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPreloaddataPreloadData;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPreloadmodelinformationPreloadList;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPreloadnetworktopologyinformationPreloadNetworkTopologyInformation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServiceModelInfrastructure;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServiceData;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServicedataVnfsVnf;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServicedataVnfsVnfVnfData;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModule;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicemodelinfrastructureService;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicestatusServiceStatus;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicetopologyServiceTopology;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVfmoduletopologyVfModuleTopology;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVnfNetworkData;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVnfresourceassignmentsVnfResourceAssignments;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVnfresourceassignmentsVnfresourceassignmentsVnfNetworks;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVnftopologyVnfTopology;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-
-@Controller
-@ComponentScan(basePackages = { "org.onap.sdnc.apps.ms.gra.*" })
-@EntityScan("org.onap.sdnc.apps.ms.gra.springboot.*")
-public class ConfigApiController implements ConfigApi {
-    private static final Logger log = LoggerFactory.getLogger(ConfigApiController.class);
-
-    private final ObjectMapper objectMapper;
-
-    private final HttpServletRequest request;
-
-    @Autowired
-    private ConfigPreloadDataRepository configPreloadDataRepository;
-
-    @Autowired
-    private ConfigServicesRepository configServicesRepository;
-
-    @Autowired
-    private ConfigNetworksRepository configNetworksRepository;
-    
-    @Autowired
-    private ConfigVnfsRepository configVnfsRepository;
-
-    @Autowired
-    private ConfigVfModulesRepository configVfModulesRepository;
-    
-    @Autowired
-    private ConfigPortMirrorConfigurationsRepository configPortMirrorConfigurationsRepository;
-
-    @Autowired
-    private ConfigContrailRouteAllottedResourcesRepository configContrailRouteAllottedResourcesRepository;
-    
-    @Autowired
-    private ServiceDataHelper serviceDataHelper;
-
-    @Autowired
-    public ConfigApiController(ObjectMapper objectMapper, HttpServletRequest request) {
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        this.objectMapper = objectMapper;
-        this.request = request;
-    }
-
-    @Override
-    public Optional<ObjectMapper> getObjectMapper() {
-        return Optional.ofNullable(objectMapper);
-    }
-
-    @Override
-    public Optional<HttpServletRequest> getRequest() {
-        return Optional.ofNullable(request);
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIpreloadInformationDelete() {
-        configPreloadDataRepository.deleteAll();
-        return (new ResponseEntity<>(HttpStatus.NO_CONTENT));
-    }
-
-    /**
-     * Extracts port-mirror configuration data from CONFIG_GRA_PORT_MIRROR_CONFIGURATIONS for a given, configuration-id
-     * <p>
-     * Maps to /config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/
-     * @param configurationId the configuration ID for a port-mirror
-     * @return HttpStatus.OK (200) if the data is found.
-     * @throws RestException if the data does not exist.
-     */
-    public ResponseEntity<GenericResourceApiPortmirrorconfigurationsPortMirrorConfiguration>
-                configGENERICRESOURCEAPIportMirrorConfigurationsPortMirrorConfigurationConfigurationIdGet(
-                    String configurationId) throws RestApplicationException {
-        GenericResourceApiPortmirrorconfigurationsPortMirrorConfiguration retval = null;
-
-        List<ConfigPortMirrorConfigurations> pmConfigurations = configPortMirrorConfigurationsRepository.findByConfigurationId(configurationId);
-
-        if (pmConfigurations.isEmpty()) {
-            log.info("No configuration data found with id [{}]",configurationId);
-            throw new RestApplicationException("data-missing",
-                    "Request could not be completed because the relevant data model content does not exist",
-                    HttpStatus.NOT_FOUND.value());
-        } else {
-            ConfigPortMirrorConfigurations pmConfiguration = pmConfigurations.get(0);
-            retval = new GenericResourceApiPortmirrorconfigurationsPortMirrorConfiguration();
-            retval.setConfigurationId(configurationId);
-            retval.setConfigurationStatus(pmConfiguration.getPortMirrorConfigurationStatus());
-            try {
-                retval.setConfigurationData(objectMapper.readValue(pmConfiguration.getPmcData(), GenericResourceApiPortmirrorconfigurationsPortmirrorconfigurationConfigurationData.class));
-            } catch (JsonProcessingException e) {
-                log.error("Could not deserialize service data for service instance id {}", configurationId, e);
-                throw new RestApplicationException("data-conversion", "Request could not be completed due to internal error", e, HttpStatus.INTERNAL_SERVER_ERROR.value());
-            }
-        }
-        return new ResponseEntity<>(retval, HttpStatus.OK);
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIportMirrorConfigurationsPortMirrorConfigurationConfigurationIdPut(
-            String configurationId, @Valid GenericResourceApiPortmirrorconfigurationsPortMirrorConfiguration newConfiguration)
-                throws RestApplicationException {
-
-        boolean dataExists = false;
-
-        String newConfigurationId = newConfiguration.getConfigurationId();
-
-        ConfigPortMirrorConfigurations portMirrorConfiguration = null;
-        List<ConfigPortMirrorConfigurations> existingConfiguration = configPortMirrorConfigurationsRepository.findByConfigurationId(configurationId);
-        if ((existingConfiguration != null) && !existingConfiguration.isEmpty()) {
-            dataExists = true;
-            portMirrorConfiguration = existingConfiguration.get(0);
-        } else {
-            portMirrorConfiguration = new ConfigPortMirrorConfigurations();
-            portMirrorConfiguration.setConfigureationId(configurationId);
-        }
-
-        try {
-            portMirrorConfiguration.setPmcData(objectMapper.writeValueAsString(newConfiguration.getConfigurationData()));
-        } catch (JsonProcessingException e) {
-            log.error("Could not serialize porr-mirror configuration data for {}", portMirrorConfiguration.getConfigureationId(), e);
-            throw new RestApplicationException("data-conversion", "Request could not be completed due to internal error", e, HttpStatus.INTERNAL_SERVER_ERROR.value());
-
-        }
-        portMirrorConfiguration.setPortMirrorConfigurationStatus(newConfiguration.getConfigurationStatus());
-        configPortMirrorConfigurationsRepository.save(portMirrorConfiguration);
-
-        if (dataExists) {
-            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-        } else {
-            return new ResponseEntity<>(HttpStatus.CREATED);
-        }
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiPortmirrorconfigurationtopologyPortMirrorConfigurationTopology>
-            configGENERICRESOURCEAPIportMirrorConfigurationsPortMirrorConfigurationConfigurationIdConfigurationDataPortMirrorConfigurationTopologyGet(
-                    String configurationId) throws RestApplicationException, RestProtocolException {
-        @Valid GenericResourceApiPortmirrorconfigurationtopologyPortMirrorConfigurationTopology portMirrorConfigurationTopology = null;
-        GenericResourceApiPortmirrorconfigurationsPortmirrorconfigurationConfigurationData portMirrorConfigurationData = null;
-
-        List<ConfigPortMirrorConfigurations> configPortMirrorConfigurations = configPortMirrorConfigurationsRepository.findByConfigurationId(configurationId);
-        if ((configPortMirrorConfigurations == null) || (configPortMirrorConfigurations.isEmpty())) {
-            log.info("No configuration data found with id [{}]", configurationId);
-            throw new RestApplicationException("data-missing",
-                    "Request could not be completed because the relevant data model content does not exist",
-                    HttpStatus.NOT_FOUND.value());
-        }
-
-        try {
-            if ( configPortMirrorConfigurations.get(0).getPmcData().isEmpty()) {
-                throw new RestProtocolException("data-missing", "No configuration-data entry found", HttpStatus.NOT_FOUND.value());
-            } else {
-                portMirrorConfigurationData = objectMapper.readValue(configPortMirrorConfigurations.get(0).getPmcData(), GenericResourceApiPortmirrorconfigurationsPortmirrorconfigurationConfigurationData.class);
-                portMirrorConfigurationTopology = portMirrorConfigurationData.getPortMirrorConfigurationTopology();
-            }
-            if (portMirrorConfigurationTopology == null) {
-                throw new RestProtocolException("data-missing", "No service-topology entry found", HttpStatus.NOT_FOUND.value());
-            }
-            return new ResponseEntity<>(portMirrorConfigurationTopology, HttpStatus.OK);
-        } catch (JsonProcessingException e) {
-            log.error("Could not parse service data", e);
-            throw new RestApplicationException("data-conversion", "Request could not be completed due to internal error", e, HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-    }
-
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIportMirrorConfigurationsPortMirrorConfigurationConfigurationIdDelete(String configurationId) {
-        configPortMirrorConfigurationsRepository.deleteByConfigurationId(configurationId);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    /**
-     * Extracts contrail-route-allotted-resource data from CONFIG_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES for a given allottedResourceId
-     * <p>
-     * Maps to /config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}
-     * @param allottedResourceId the allotted-resource-id for a contrail-route
-     * @return HttpStatus.OK (200) if the data is found.
-     * @throws RestException if the data does not exist.
-     */
-    public ResponseEntity<GenericResourceApiContrailrouteallottedresourcesContrailRouteAllottedResource>
-                configGENERICRESOURCEAPIcontrailRouteAllottedResourcesContrailRouteAllottedResourceAllottedResourceIdGet(
-                        String allottedResourceId) throws RestApplicationException {
-        GenericResourceApiContrailrouteallottedresourcesContrailRouteAllottedResource retval = null;
-
-        List<ConfigContrailRouteAllottedResources> allottedResources = configContrailRouteAllottedResourcesRepository.findByAllottedResourceId(allottedResourceId);
-
-        if (allottedResources.isEmpty()) {
-            log.info("No contrail-route-allotted-resource found with id [{}]", allottedResourceId);
-            throw new RestApplicationException("data-missing",
-                    "Request could not be completed because the relevant data model content does not exist",
-                    HttpStatus.NOT_FOUND.value());
-        }
-        else {
-            ConfigContrailRouteAllottedResources allottedResource = allottedResources.get(0);
-            retval = new GenericResourceApiContrailrouteallottedresourcesContrailRouteAllottedResource();
-            retval.setAllottedResourceId(allottedResourceId);
-            retval.setAllottedResourceStatus(allottedResource.getAllottedResourceStatus());
-            try {
-                retval.setAllottedResourceData(objectMapper.readValue(allottedResource.getArData(),
-                        GenericResourceApiContrailrouteallottedresourcesContrailrouteallottedresourceAllottedResourceData.class));
-            } catch (JsonProcessingException e) {
-                log.error("Could not deserialize service data for service instance id {}", allottedResourceId, e);
-                throw new RestApplicationException("data-conversion", "Request could not be completed due to internal error", e, HttpStatus.INTERNAL_SERVER_ERROR.value());
-            }
-        }
-        return new ResponseEntity<>(retval, HttpStatus.OK);
-    }
-
-    /**
-     * PUT contrail-route-allotted-resource data from CONFIG_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES for a given allottedResourceId
-     * <p>
-     * Maps to /config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}
-     * @param allottedResourceId the allotted-resource-id for a contrail-route
-     * @return HttpStatus.OK (200) if the data is found.
-     * @throws RestException if the data does not exist.
-     */
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIcontrailRouteAllottedResourcesContrailRouteAllottedResourceAllottedResourceIdPut(
-            String allottedResourceId, @Valid GenericResourceApiContrailrouteallottedresourcesContrailRouteAllottedResource newAllottedResource)
-            throws RestApplicationException {
-
-        boolean dataExists = false;
-
-        String newAllottedResourceId = newAllottedResource.getAllottedResourceId();
-
-        ConfigContrailRouteAllottedResources allottedResource = null;
-        List<ConfigContrailRouteAllottedResources> existingAllottedResource =
-                configContrailRouteAllottedResourcesRepository.findByAllottedResourceId(allottedResourceId);
-
-        if ((existingAllottedResource != null) && !existingAllottedResource.isEmpty()) {
-            dataExists = true;
-            allottedResource = existingAllottedResource.get(0);
-        } else {
-            allottedResource = new ConfigContrailRouteAllottedResources();
-            allottedResource.setAllottedResourceId(allottedResourceId);
-        }
-
-        try {
-            allottedResource.setArData(objectMapper.writeValueAsString(newAllottedResource.getAllottedResourceData()));
-        } catch (JsonProcessingException e) {
-            log.error("Could not serialize porr-mirror configuration data for {}", allottedResource.getAllottedResourceId(), e);
-            throw new RestApplicationException("data-conversion", "Request could not be completed due to internal error", e, HttpStatus.INTERNAL_SERVER_ERROR.value());
-
-        }
-        allottedResource.setAllottedResourceStatus(newAllottedResource.getAllottedResourceStatus());
-        configContrailRouteAllottedResourcesRepository.save(allottedResource);
-
-        if (dataExists) {
-            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-        } else {
-            return new ResponseEntity<>(HttpStatus.CREATED);
-        }
-    }
-
-    /**
-     * Extracts contrail-route-topology data from CONFIG_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES for a given allottedResourceId
-     * <p>
-     * Maps to /config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/allotted-resource-data/contrail-route-topology/
-     * @param allottedResourceId the allotted-resource-id for a contrail-route
-     * @return HttpStatus.OK (200) if the data is found.
-     * @throws RestException if the data does not exist.
-     */
-    @Override
-    public ResponseEntity<GenericResourceApiContrailroutetopologyContrailRouteTopology>
-            configGENERICRESOURCEAPIcontrailRouteAllottedResourcesContrailRouteAllottedResourceAllottedResourceIdAllottedResourceDataContrailRouteTopologyGet(
-                String allottedResourceId) throws RestApplicationException, RestProtocolException {
-        @Valid GenericResourceApiContrailroutetopologyContrailRouteTopology contrailRouteTopology = null;
-        GenericResourceApiContrailrouteallottedresourcesContrailrouteallottedresourceAllottedResourceData allottedResourceData = null;
-
-        List<ConfigContrailRouteAllottedResources> configContrailRouteAllottedResources =
-                configContrailRouteAllottedResourcesRepository.findByAllottedResourceId(allottedResourceId);
-
-        if ((configContrailRouteAllottedResources == null) || (configContrailRouteAllottedResources.isEmpty())) {
-            log.info("No contrail-route-allotted-resoure data found with id [{}]", allottedResourceId);
-            throw new RestApplicationException("data-missing",
-                    "Request could not be completed because the relevant data model content does not exist",
-                    HttpStatus.NOT_FOUND.value());
-        }
-
-        try {
-            if ( configContrailRouteAllottedResources.get(0).getArData().isEmpty()) {
-                throw new RestProtocolException("data-missing", "No allotted-resource-data entry found", HttpStatus.NOT_FOUND.value());
-            } else {
-                allottedResourceData = objectMapper.readValue(configContrailRouteAllottedResources.get(0).getArData(),
-                        GenericResourceApiContrailrouteallottedresourcesContrailrouteallottedresourceAllottedResourceData.class);
-
-                contrailRouteTopology = allottedResourceData.getContrailRouteTopology();
-            }
-            if (contrailRouteTopology == null) {
-                throw new RestProtocolException("data-missing", "No contrail-route-topology entry found", HttpStatus.NOT_FOUND.value());
-            }
-            return new ResponseEntity<>(contrailRouteTopology, HttpStatus.OK);
-        } catch (JsonProcessingException e) {
-            log.error("Could not parse port-mirror-configuration data", e);
-            throw new RestApplicationException("data-conversion", "Request could not be completed due to internal error", e, HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-    }
-
-
-    /**
-     * DELETE allotted-resource data from CONFIG_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES for a given allottedResourceId
-     * <p>
-     * Maps to /config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}
-     * @param allottedResourceId the allotted-resource-id for a contrail-route
-     * @return HttpStatus.NO_CONTENT (204) if the data is found.
-     */
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIcontrailRouteAllottedResourcesContrailRouteAllottedResourceAllottedResourceIdDelete(
-            String allottedResourceId) {
-        configContrailRouteAllottedResourcesRepository.deleteByAllottedResourceId(allottedResourceId);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-
-    @Override
-    public ResponseEntity<GenericResourceApiPreloadModelInformation> configGENERICRESOURCEAPIpreloadInformationGet()
-            throws RestApplicationException {
-        GenericResourceApiPreloadModelInformation genericResourceApiPreloadModelInformation = new GenericResourceApiPreloadModelInformation();
-
-        if (configPreloadDataRepository.count() == 0) {
-            throw new RestApplicationException("data-missing",
-                    "Request could not be completed because the relevant data model content does not exist",
-                    HttpStatus.NOT_FOUND.value());
-        }
-
-        for (ConfigPreloadData configPreloadData : configPreloadDataRepository.findAll()) {
-            GenericResourceApiPreloadmodelinformationPreloadList preloadListItem = new GenericResourceApiPreloadmodelinformationPreloadList();
-
-            preloadListItem.setPreloadId(configPreloadData.getPreloadId());
-            preloadListItem.setPreloadType(configPreloadData.getPreloadType());
-            try {
-                preloadListItem.setPreloadData(objectMapper.readValue(configPreloadData.getPreloadData(),
-                        GenericResourceApiPreloaddataPreloadData.class));
-            } catch (JsonProcessingException e) {
-                log.error("Could not convert preload data", e);
-                throw new RestApplicationException("data-conversion",
-                        "Request could not be completed due to internal error", e,
-                        HttpStatus.INTERNAL_SERVER_ERROR.value());
-            }
-            genericResourceApiPreloadModelInformation.addPreloadListItem(preloadListItem);
-        }
-
-        return new ResponseEntity<>(genericResourceApiPreloadModelInformation, HttpStatus.OK);
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiPreloadnetworktopologyinformationPreloadNetworkTopologyInformation> configGENERICRESOURCEAPIpreloadInformationPreloadListPreloadIdPreloadTypePreloadDataPreloadNetworkTopologyInformationGet(
-            String preloadId, String preloadType) throws RestException {
-        GenericResourceApiPreloadnetworktopologyinformationPreloadNetworkTopologyInformation netTopoInfo = null;
-
-        if (configPreloadDataRepository.count() == 0) {
-            throw new RestApplicationException("data-missing",
-                    "Request could not be completed because the relevant data model content does not exist",
-                    HttpStatus.NOT_FOUND.value());
-        }
-
-        for (ConfigPreloadData configPreloadData : configPreloadDataRepository.findAll()) {
-
-            try {
-                GenericResourceApiPreloaddataPreloadData preloadDataItem = objectMapper
-                        .readValue(configPreloadData.getPreloadData(), GenericResourceApiPreloaddataPreloadData.class);
-                netTopoInfo = preloadDataItem.getPreloadNetworkTopologyInformation();
-            } catch (JsonProcessingException e) {
-                log.error("Could not convert preload data", e);
-                throw new RestApplicationException("data-conversion",
-                        "Request could not be completed due to internal error", e,
-                        HttpStatus.INTERNAL_SERVER_ERROR.value());
-            }
-        }
-        
-        return new ResponseEntity<>(netTopoInfo, HttpStatus.OK);
-    }
-
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIpreloadInformationPost(
-            @Valid GenericResourceApiPreloadModelInformation graPreloadModelInfo)
-            throws RestApplicationException, RestProtocolException {
-
-        List<GenericResourceApiPreloadmodelinformationPreloadList> preloadList = graPreloadModelInfo.getPreloadList();
-        List<ConfigPreloadData> newPreloadData = new LinkedList<>();
-
-        if (preloadList != null) {
-            // Verification pass - if any items already exist, return an error
-            for (GenericResourceApiPreloadmodelinformationPreloadList curItem : preloadList) {
-
-                List<ConfigPreloadData> curPreloadData = configPreloadDataRepository
-                        .findByPreloadIdAndPreloadType(curItem.getPreloadId(), curItem.getPreloadType());
-                if ((curPreloadData != null) && (!curPreloadData.isEmpty())) {
-                    log.error("Preload data already exists for {}:{}", curItem.getPreloadId(),
-                            curItem.getPreloadType());
-                    throw new RestProtocolException("data-exists",
-                            "Data already exists for " + curItem.getPreloadId() + ":" + curItem.getPreloadType(),
-                            HttpStatus.CONFLICT.value());
-                } else {
-                    try {
-                        newPreloadData.add(new ConfigPreloadData(curItem.getPreloadId(), curItem.getPreloadType(),
-                                objectMapper.writeValueAsString(curItem.getPreloadData())));
-                    } catch (JsonProcessingException e) {
-                        log.error("Cannot convert preload data");
-                        throw new RestApplicationException("data-conversion",
-                                "Request could not be completed due to internal error", e,
-                                HttpStatus.INTERNAL_SERVER_ERROR.value());
-
-                    }
-                }
-            }
-
-            // Update pass
-            for (ConfigPreloadData newDataItem : newPreloadData) {
-                log.info("Adding preload data for {}:{}", newDataItem.getPreloadId(), newDataItem.getPreloadType());
-                configPreloadDataRepository.save(newDataItem);
-            }
-        } else {
-            throw new RestProtocolException("data-missing", "No preload-list entries found to add",
-                    HttpStatus.CONFLICT.value());
-        }
-
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIpreloadInformationPut(
-            @Valid GenericResourceApiPreloadModelInformation graPreloadModelInfo) throws RestApplicationException {
-
-        boolean addedNew = false;
-        List<GenericResourceApiPreloadmodelinformationPreloadList> preloadList = graPreloadModelInfo.getPreloadList();
-
-        if (preloadList != null) {
-            Iterator<GenericResourceApiPreloadmodelinformationPreloadList> iter = preloadList.iterator();
-            while (iter.hasNext()) {
-                GenericResourceApiPreloadmodelinformationPreloadList curItem = iter.next();
-                List<ConfigPreloadData> curPreloadData = configPreloadDataRepository
-                        .findByPreloadIdAndPreloadType(curItem.getPreloadId(), curItem.getPreloadType());
-                if ((curPreloadData == null) || curPreloadData.isEmpty()) {
-                    addedNew = true;
-                }
-
-                try {
-                    configPreloadDataRepository.save(new ConfigPreloadData(curItem.getPreloadId(),
-                            curItem.getPreloadType(), objectMapper.writeValueAsString(curItem.getPreloadData())));
-                } catch (JsonProcessingException e) {
-                    log.error("Cannot convert preload data", e);
-                    throw new RestApplicationException("data-conversion",
-                            "Request could not be completed due to internal error", e,
-                            HttpStatus.INTERNAL_SERVER_ERROR.value());
-
-                }
-            }
-        }
-
-        if (addedNew) {
-            return new ResponseEntity<>(HttpStatus.CREATED);
-        } else {
-            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-        }
-
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIpreloadInformationPreloadListPost(
-            @Valid GenericResourceApiPreloadmodelinformationPreloadList preloadListItem) throws RestProtocolException {
-
-        throw new RestProtocolException("data-missing", "Missing key for list \"preload-list\"",
-                HttpStatus.NOT_FOUND.value());
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIpreloadInformationPreloadListPreloadIdPreloadTypeDelete(
-            String preloadId, String preloadType) {
-        configPreloadDataRepository.deleteByPreloadIdAndPreloadType(preloadId, preloadType);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiPreloadmodelinformationPreloadList> configGENERICRESOURCEAPIpreloadInformationPreloadListPreloadIdPreloadTypeGet(
-            String preloadId, String preloadType) throws RestApplicationException {
-        List<ConfigPreloadData> preloadData = configPreloadDataRepository.findByPreloadIdAndPreloadType(preloadId,
-                preloadType);
-        if (preloadData != null) {
-            if (!preloadData.isEmpty()) {
-                ConfigPreloadData preloadDataItem = preloadData.get(0);
-                GenericResourceApiPreloadmodelinformationPreloadList preloadDataList = new GenericResourceApiPreloadmodelinformationPreloadList();
-                preloadDataList.setPreloadId(preloadDataItem.getPreloadId());
-                preloadDataList.setPreloadType(preloadDataItem.getPreloadType());
-                try {
-                    preloadDataList.setPreloadData(objectMapper.readValue(preloadDataItem.getPreloadData(),
-                            GenericResourceApiPreloaddataPreloadData.class));
-                } catch (JsonProcessingException e) {
-                    log.error("Cannot convert preload data", e);
-                    throw new RestApplicationException("data-conversion",
-                            "Request could not be completed due to internal error", e,
-                            HttpStatus.INTERNAL_SERVER_ERROR.value());
-                }
-                return new ResponseEntity<>(preloadDataList, HttpStatus.OK);
-            }
-        }
-        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIpreloadInformationPreloadListPreloadIdPreloadTypePost(
-            String preloadId, String preloadType,
-            @Valid GenericResourceApiPreloadmodelinformationPreloadList preloadListItem)
-            throws RestApplicationException, RestProtocolException {
-        List<ConfigPreloadData> preloadDataItems = configPreloadDataRepository.findByPreloadIdAndPreloadType(preloadId,
-                preloadType);
-
-        if ((preloadDataItems != null) && !preloadDataItems.isEmpty()) {
-            log.error("Preload data already exists for {}:{}", preloadId, preloadType);
-            throw new RestProtocolException("data-exists", "Data already exists for " + preloadId + ":" + preloadType,
-                    HttpStatus.CONFLICT.value());
-        }
-
-        try {
-            log.info("Adding preload data for {}:{}", preloadId, preloadType);
-            configPreloadDataRepository.save(new ConfigPreloadData(preloadId, preloadType,
-                    objectMapper.writeValueAsString(preloadListItem.getPreloadData())));
-        } catch (JsonProcessingException e) {
-            log.error("Cannot convert preload data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-
-        }
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIpreloadInformationPreloadListPreloadIdPreloadTypePut(
-            String preloadId, String preloadType,
-            @Valid GenericResourceApiPreloadmodelinformationPreloadList preloadListItem)
-            throws RestApplicationException, RestProtocolException {
-        List<ConfigPreloadData> preloadDataItems = configPreloadDataRepository.findByPreloadIdAndPreloadType(preloadId,
-                preloadType);
-        boolean dataExists = false;
-        if ((preloadDataItems != null) && !preloadDataItems.isEmpty()) {
-            dataExists = true;
-        }
-
-        if ((preloadListItem.getPreloadId() == null) || (preloadListItem.getPreloadType() == null)
-                || (preloadListItem.getPreloadData() == null)) {
-            log.error("Invalid list item received: {}", preloadListItem);
-            throw new RestProtocolException("bad-attribute", "Invalid data received", HttpStatus.BAD_REQUEST.value());
-        }
-
-        try {
-            if (dataExists) {
-                log.info("Updating preload data for {}:{} -> {}", preloadId, preloadType,
-                        objectMapper.writeValueAsString(preloadListItem));
-
-            } else {
-                log.info("Adding preload data for {}:{}", preloadId, preloadType);
-            }
-
-            configPreloadDataRepository.save(new ConfigPreloadData(preloadId, preloadType,
-                    objectMapper.writeValueAsString(preloadListItem.getPreloadData())));
-        } catch (JsonProcessingException e) {
-            log.error("Cannot convert preload data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-
-        }
-
-        if (dataExists) {
-            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-        } else {
-            return new ResponseEntity<>(HttpStatus.CREATED);
-        }
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIpreloadInformationPreloadListPreloadIdPreloadTypePreloadDataDelete(
-            String preloadId, String preloadType) throws RestProtocolException {
-        List<ConfigPreloadData> preloadData = configPreloadDataRepository.findByPreloadIdAndPreloadType(preloadId,
-                preloadType);
-
-        if ((preloadData == null) || preloadData.isEmpty()) {
-            throw new RestProtocolException("data-missing", "No preload entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        ConfigPreloadData preloadDataItem = preloadData.get(0);
-
-        if (preloadDataItem.getPreloadData() == null) {
-            throw new RestProtocolException("data-missing", "No preload-data found", HttpStatus.NOT_FOUND.value());
-        }
-        preloadDataItem.setPreloadData(null);
-        configPreloadDataRepository.save(preloadDataItem);
-
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiPreloaddataPreloadData> configGENERICRESOURCEAPIpreloadInformationPreloadListPreloadIdPreloadTypePreloadDataGet(
-            String preloadId, String preloadType) throws RestApplicationException, RestProtocolException {
-        List<ConfigPreloadData> preloadData = configPreloadDataRepository.findByPreloadIdAndPreloadType(preloadId,
-                preloadType);
-
-        if ((preloadData == null) || preloadData.isEmpty()) {
-            throw new RestProtocolException("data-missing", "No preload entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        ConfigPreloadData preloadDataItem = preloadData.get(0);
-
-        if (preloadDataItem.getPreloadData() == null) {
-            throw new RestProtocolException("data-missing", "No preload-data found", HttpStatus.NOT_FOUND.value());
-        }
-        try {
-            return new ResponseEntity<>(objectMapper.readValue(preloadDataItem.getPreloadData(),
-                    GenericResourceApiPreloaddataPreloadData.class), HttpStatus.OK);
-        } catch (JsonProcessingException e) {
-            log.error("Cannot convert preload data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIpreloadInformationPreloadListPreloadIdPreloadTypePreloadDataPost(
-            String preloadId, String preloadType, @Valid GenericResourceApiPreloaddataPreloadData preloadData)
-            throws RestApplicationException, RestProtocolException {
-
-
-        List<ConfigPreloadData> preloadDataItems = configPreloadDataRepository.findByPreloadIdAndPreloadType(preloadId,
-                preloadType);
-        if ((preloadDataItems == null) || (preloadDataItems.isEmpty())) {
-            throw new RestProtocolException("data-missing", "No preload entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        if ((preloadData == null) || (preloadData.getPreloadNetworkTopologyInformation() == null)) {
-            throw new RestProtocolException("bad-attribute", "Invalid preloadData received",
-                    HttpStatus.BAD_REQUEST.value());
-        }
-
-        ConfigPreloadData preloadDataItem = preloadDataItems.get(0);
-
-        if (preloadDataItem.getPreloadData() != null) {
-            log.error("Preload data already exists for {}:{} ", preloadId, preloadType);
-            throw new RestProtocolException("data-exists", "Data already exists for " + preloadId + ":" + preloadType,
-                    HttpStatus.CONFLICT.value());
-        }
-
-        try {
-            preloadDataItem.setPreloadData(objectMapper.writeValueAsString(preloadData));
-            configPreloadDataRepository.save(preloadDataItem);
-        } catch (JsonProcessingException e) {
-            log.error("Cannot convert preload data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIpreloadInformationPreloadListPreloadIdPreloadTypePreloadDataPut(
-            String preloadId, String preloadType, @Valid GenericResourceApiPreloaddataPreloadData preloadData)
-            throws RestApplicationException, RestProtocolException {
-        boolean dataExists = false;
-        List<ConfigPreloadData> preloadDataItems = configPreloadDataRepository.findByPreloadIdAndPreloadType(preloadId,
-                preloadType);
-        if ((preloadDataItems == null) || (preloadDataItems.isEmpty())) {
-            throw new RestProtocolException("data-missing", "No preload entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        if ((preloadData == null) || (preloadData.getPreloadNetworkTopologyInformation() == null)) {
-            throw new RestProtocolException("bad-attribute", "Invalid preloadData received",
-                    HttpStatus.BAD_REQUEST.value());
-        }
-
-        ConfigPreloadData preloadDataItem = preloadDataItems.get(0);
-
-        if (preloadDataItem.getPreloadData() != null) {
-            dataExists = true;
-        }
-
-        try {
-            preloadDataItem.setPreloadData(objectMapper.writeValueAsString(preloadData));
-            configPreloadDataRepository.save(preloadDataItem);
-        } catch (JsonProcessingException e) {
-            log.error("Cannot convert preload data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-
-        if (dataExists) {
-            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-        } else {
-            return new ResponseEntity<>(HttpStatus.CREATED);
-        }
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesDelete() {
-        configVfModulesRepository.deleteAll();
-        configVnfsRepository.deleteAll();
-        configNetworksRepository.deleteAll();
-        configServicesRepository.deleteAll();
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiServiceModelInfrastructure> configGENERICRESOURCEAPIservicesGet()
-            throws RestApplicationException {
-        GenericResourceApiServiceModelInfrastructure modelInfrastructure = new GenericResourceApiServiceModelInfrastructure();
-
-        if (configServicesRepository.count() == 0) {
-            throw new RestApplicationException("data-missing",
-                    "Request could not be completed because the relevant data model content does not exist",
-                    HttpStatus.NOT_FOUND.value());
-        }
-
-        for (ConfigServices service : configServicesRepository.findAll()) {
-            GenericResourceApiServicemodelinfrastructureService serviceItem = new GenericResourceApiServicemodelinfrastructureService();
-            String svcInstanceId = service.getSvcInstanceId();
-
-            serviceItem.setServiceInstanceId(svcInstanceId);
-            serviceItem.setServiceStatus(service.getServiceStatus());
-
-            // Construct service data from networks/vnfs/vfModules
-            GenericResourceApiServicedataServiceData serviceItemSvcData;
-            try {
-                serviceItemSvcData = serviceDataHelper.getServiceData(service);
-            } catch (JsonProcessingException e) {
-                log.error("Could not deserialize service data for {}", service.getSvcInstanceId(), e);
-                throw new RestApplicationException("data-conversion",
-                        "Request could not be completed due to internal error", e,
-                        HttpStatus.INTERNAL_SERVER_ERROR.value());
-            }
-
-            
-            if (serviceItemSvcData != null) {
-                serviceItem.setServiceData(serviceItemSvcData);
-            }
-            modelInfrastructure.addServiceItem(serviceItem);
-        }
-
-        return new ResponseEntity<>(modelInfrastructure, HttpStatus.OK);
-
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesPost(@Valid GenericResourceApiServiceModelInfrastructure modelInfrastructure)
-            throws RestApplicationException, RestProtocolException {
-        
-        ServiceDataTransaction transaction = serviceDataHelper.createTransaction();
-
-        for (GenericResourceApiServicemodelinfrastructureService serviceItem : modelInfrastructure.getService()) {
-            String svcInstanceId = serviceItem.getServiceInstanceId();
-            List<ConfigServices> existingService = configServicesRepository.findBySvcInstanceId(svcInstanceId);
-            if ((existingService != null) && !existingService.isEmpty()) {
-                log.error("Service data already exists for {}", svcInstanceId);
-                throw new RestProtocolException("data-exists",
-                        "Data already exists for service-instance-id " + svcInstanceId, HttpStatus.CONFLICT.value());
-            }
-            ConfigServices service = new ConfigServices();
-            service.setSvcInstanceId(svcInstanceId);
-            service.setServiceStatus(serviceItem.getServiceStatus());
-
-            try {
-                serviceDataHelper.saveService(service, serviceItem.getServiceData(), transaction);
-            } catch (JsonProcessingException e) {
-                log.error("Could not serialize service data for {}", service.getSvcInstanceId(), e);
-                throw new RestApplicationException("data-conversion",
-                        "Request could not be completed due to internal error", e,
-                        HttpStatus.INTERNAL_SERVER_ERROR.value());
-
-            }
-        }
-
-        transaction.commit();
-
-        return new ResponseEntity<>(HttpStatus.CREATED);
-
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesPut(
-            @Valid GenericResourceApiServiceModelInfrastructure modelInfrastructure) throws RestApplicationException {
-
-        ServiceDataTransaction transaction = serviceDataHelper.createTransaction();
-        boolean dataExists = false;
-
-        for (GenericResourceApiServicemodelinfrastructureService serviceItem : modelInfrastructure.getService()) {
-            String svcInstanceId = serviceItem.getServiceInstanceId();
-            List<ConfigServices> existingService = configServicesRepository.findBySvcInstanceId(svcInstanceId);
-            if ((existingService != null) && !existingService.isEmpty()) {
-                dataExists = true;
-            }
-            ConfigServices service = new ConfigServices();
-            service.setSvcInstanceId(svcInstanceId);
-            service.setServiceStatus(serviceItem.getServiceStatus());
-            try {
-                serviceDataHelper.saveService(service, serviceItem.getServiceData(), transaction);
-            } catch (JsonProcessingException e) {
-                log.error("Could not serialize service data for {}", service.getSvcInstanceId(), e);
-                throw new RestApplicationException("data-conversion",
-                        "Request could not be completed due to internal error", e,
-                        HttpStatus.INTERNAL_SERVER_ERROR.value());
-
-            }
-        }
-
-        transaction.commit();
-
-        if (dataExists) {
-            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-        } else {
-            return new ResponseEntity<>(HttpStatus.CREATED);
-        }
-
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServicePost(
-            @Valid GenericResourceApiServicemodelinfrastructureService servicesData) throws RestApplicationException {
-        String svcInstanceId = servicesData.getServiceInstanceId();
-        try {
-            ConfigServices configService = new ConfigServices(svcInstanceId, servicesData.getServiceStatus());
-            serviceDataHelper.saveService(configService, servicesData.getServiceData());
-        } catch (JsonProcessingException e) {
-            log.error("Cannot convert service data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-
-        }
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdDelete(
-            String serviceInstanceId) {
-        serviceDataHelper.deleteService(serviceInstanceId);  
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiServicemodelinfrastructureService> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdGet(
-            String serviceInstanceId) throws RestApplicationException {
-        GenericResourceApiServicemodelinfrastructureService retval = null;
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-
-        if (services.isEmpty()) {
-            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-        } else {
-            ConfigServices service = services.get(0);
-            retval = new GenericResourceApiServicemodelinfrastructureService();
-            retval.setServiceInstanceId(serviceInstanceId);
-            retval.setServiceStatus(service.getServiceStatus());
-            try {
-                retval.setServiceData(serviceDataHelper.getServiceData(service));
-            } catch (JsonProcessingException e) {
-                log.error("Could not deserialize service data for service instance id {}", serviceInstanceId, e);
-                throw new RestApplicationException("data-conversion",
-                        "Request could not be completed due to internal error", e,
-                        HttpStatus.INTERNAL_SERVER_ERROR.value());
-
-            }
-        }
-
-        return new ResponseEntity<>(retval, HttpStatus.OK);
-
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdPost(String svcInstanceId,
-            @Valid GenericResourceApiServicemodelinfrastructureService newService)
-            throws RestApplicationException, RestProtocolException {
-
-        List<ConfigServices> existingService = configServicesRepository.findBySvcInstanceId(svcInstanceId);
-        if ((existingService != null) && !existingService.isEmpty()) {
-            log.error("Service data already exists for {}", svcInstanceId);
-            throw new RestProtocolException("data-exists",
-                    "Data already exists for service-instance-id " + svcInstanceId, HttpStatus.CONFLICT.value());
-        }
-        ConfigServices service = new ConfigServices();
-        service.setSvcInstanceId(svcInstanceId);
-        service.setServiceStatus(newService.getServiceStatus());
-        try {
-            serviceDataHelper.saveService(service, newService.getServiceData());
-        } catch (JsonProcessingException e) {
-            log.error("Could not serialize service data for {}", service.getSvcInstanceId(), e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-
-        }
-
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdPut(String serviceInstanceId,
-            @Valid GenericResourceApiServicemodelinfrastructureService newService) throws RestApplicationException {
-
-        boolean dataExists = false;
-
-        String svcInstanceId = newService.getServiceInstanceId();
-
-        ConfigServices service = null;
-        List<ConfigServices> existingService = configServicesRepository.findBySvcInstanceId(svcInstanceId);
-        if ((existingService != null) && !existingService.isEmpty()) {
-            dataExists = true;
-            service = existingService.get(0);
-        } else {
-            service = new ConfigServices();
-            service.setSvcInstanceId(svcInstanceId);
-        }
-
-        service.setServiceStatus(newService.getServiceStatus());
-        try {
-            serviceDataHelper.saveService(service, newService.getServiceData());
-        } catch (JsonProcessingException e) {
-            log.error("Could not serialize service data for {}", service.getSvcInstanceId(), e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-
-        }
-
-        if (dataExists) {
-            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-        } else {
-            return new ResponseEntity<>(HttpStatus.CREATED);
-        }
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataDelete(
-            String serviceInstanceId) throws RestProtocolException {
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-
-        if ((services == null) || (services.isEmpty())) {
-            throw new RestProtocolException("data-missing", "No service entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        ConfigServices service = services.get(0);
-        if (!serviceDataHelper.hasServiceData(service)) {
-            throw new RestProtocolException("data-missing", "No service-data found", HttpStatus.NOT_FOUND.value());
-        }
-        serviceDataHelper.clearServiceData(service);
-
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiServicedataServiceData> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataGet(
-            String serviceInstanceId) throws RestApplicationException, RestProtocolException {
-        GenericResourceApiServicedataServiceData serviceData = null;
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        if ((services == null) || (services.isEmpty())) {
-            throw new RestProtocolException("data-missing", "No service entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        try {
-            serviceData = serviceDataHelper.getServiceData(services.get(0));
-            return new ResponseEntity<>(serviceData, HttpStatus.OK);
-        } catch (JsonProcessingException e) {
-            log.error("Could not parse service data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataPost(
-            String serviceInstanceId, @Valid GenericResourceApiServicedataServiceData serviceData)
-            throws RestApplicationException, RestProtocolException {
-        ConfigServices service;
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        if ((services == null) || (services.isEmpty())) {
-            throw new RestProtocolException("data-missing", "No service entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        if ((serviceData == null) || (serviceData.getServiceInformation() == null)) {
-            throw new RestProtocolException("bad-attribute", "Invalid service-data received",
-                    HttpStatus.BAD_REQUEST.value());
-
-        }
-        service = services.get(0);
-
-        if (serviceDataHelper.hasServiceData(service)) {
-            log.error("service-data already exists for svcInstanceId {}", serviceInstanceId);
-            throw new RestProtocolException("data-exists", "Data already exists for " + serviceInstanceId,
-                    HttpStatus.CONFLICT.value());
-        }
-
-        try {
-            serviceDataHelper.saveService(service, serviceData);
-        } catch (JsonProcessingException e) {
-            log.error("Could not serialize service data for svc instance id {}", serviceInstanceId, e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-
-        return new ResponseEntity<>(HttpStatus.CREATED);
-
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataPut(
-            String serviceInstanceId, @Valid GenericResourceApiServicedataServiceData serviceData)
-            throws RestApplicationException, RestProtocolException {
-        ConfigServices service;
-        boolean dataExists = false;
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        if ((services == null) || (services.isEmpty())) {
-            throw new RestProtocolException("data-missing", "No service entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        if ((serviceData == null) || (serviceData.getServiceInformation() == null)) {
-            throw new RestProtocolException("bad-attribute", "Invalid service-data received",
-                    HttpStatus.BAD_REQUEST.value());
-
-        }
-        service = services.get(0);
-
-        dataExists = serviceDataHelper.hasServiceData(service);
-
-        try {
-            serviceDataHelper.saveService(service, serviceData);
-        } catch (JsonProcessingException e) {
-            log.error("Could not serialize service data for svc instance id {}", serviceInstanceId, e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-
-        if (dataExists) {
-            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-        } else {
-            return new ResponseEntity<>(HttpStatus.CREATED);
-        }
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceStatusDelete(
-            String serviceInstanceId) throws RestProtocolException {
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-
-        if ((services == null) || (services.isEmpty())) {
-            throw new RestProtocolException("data-missing", "No service entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        ConfigServices service = services.get(0);
-        if (service.getServiceStatus() == null) {
-            throw new RestProtocolException("data-missing", "No service-status found", HttpStatus.NOT_FOUND.value());
-        }
-        service.setServiceStatus(null);
-        configServicesRepository.save(service);
-
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiServicestatusServiceStatus> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceStatusGet(
-            String serviceInstanceId) throws RestApplicationException, RestProtocolException {
-        GenericResourceApiServicestatusServiceStatus serviceStatus = null;
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        if ((services == null) || (services.isEmpty())) {
-            throw new RestProtocolException("data-missing", "No service entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        serviceStatus = services.get(0).getServiceStatus();
-        return new ResponseEntity<>(serviceStatus, HttpStatus.OK);
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceStatusPost(
-            String serviceInstanceId, @Valid GenericResourceApiServicestatusServiceStatus serviceStatus)
-            throws RestProtocolException {
-        ConfigServices service;
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        if ((services == null) || (services.isEmpty())) {
-            throw new RestProtocolException("data-missing", "No service entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        if ((serviceStatus == null) || (serviceStatus.getAction() == null)) {
-            throw new RestProtocolException("bad-attribute", "Invalid service-status received",
-                    HttpStatus.BAD_REQUEST.value());
-
-        }
-        service = services.get(0);
-
-        if (service.getServiceStatus() != null) {
-            log.error("service-status already exists for svcInstanceId {}", serviceInstanceId);
-            throw new RestProtocolException("data-exists", "Data already exists for " + serviceInstanceId,
-                    HttpStatus.CONFLICT.value());
-        }
-
-        service.setServiceStatus(serviceStatus);
-        configServicesRepository.save(service);
-
-        return new ResponseEntity<>(HttpStatus.CREATED);
-
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceStatusPut(
-            String serviceInstanceId, @Valid GenericResourceApiServicestatusServiceStatus serviceStatus)
-            throws RestProtocolException {
-        ConfigServices service;
-        boolean dataExists = false;
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        if ((services == null) || (services.isEmpty())) {
-            throw new RestProtocolException("data-missing", "No service entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        if ((serviceStatus == null) || (serviceStatus.getAction() == null)) {
-            throw new RestProtocolException("bad-attribute", "Invalid service-status received",
-                    HttpStatus.BAD_REQUEST.value());
-
-        }
-        service = services.get(0);
-
-        if (service.getServiceStatus() != null) {
-            dataExists = true;
-        }
-
-        service.setServiceStatus(serviceStatus);
-        configServicesRepository.save(service);
-
-        if (dataExists) {
-            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-        } else {
-            return new ResponseEntity<>(HttpStatus.CREATED);
-        }
-    }
-
-    /**
-     * Deletes VNF data from the Config table specified Service Instance.
-     * <p>
-     * Maps to
-     * /config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/
-     * 
-     * @param serviceInstanceId the Service Instance ID to perform the delete on
-     * @param vnfId             the VNF ID of the VNF to delete
-     * @return HttpStatus.NO_CONTENT (204) on successful delete
-     *         <p>
-     *         HttpStatus.BAD_REQUEST (400) if unmarshalling Service Data from the
-     *         database fails, there is no VNF data for {@code vnfId}, or writing
-     *         Service Data back to the database fails.
-     *         <p>
-     *         HttpStatus.NOT_FOUND (404) if {@code serviceInstanceId} does not
-     *         exist.
-     */
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataVnfsVnfVnfIdDelete(
-            String serviceInstanceId, String vnfId) throws RestException {
-        log.info("DELETE | VNF Data for ({})", vnfId);
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        ConfigServices data;
-        if ((services == null) || (services.isEmpty())) {
-            log.info("Could not find data for ({}).", serviceInstanceId);
-            // Or throw the data not found error?
-            throw new RestProtocolException("data-missing", "Service Instance ID not found.",
-                    HttpStatus.NOT_FOUND.value());
-        } else {
-            data = services.get(0);
-        }
-
-        if (!serviceDataHelper.hasServiceData(data)) {
-            log.info("Could not find Service Data for ({}).", serviceInstanceId);
-            throw new RestProtocolException("data-missing", "Service data not found.", HttpStatus.NOT_FOUND.value());
-        }
-
-        if (serviceDataHelper.deleteVnf(serviceInstanceId, vnfId) > 0) {
-            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-        } else {
-            // Data was not found
-            log.error("Did not find VNF ({}) in data.", vnfId);
-            throw new RestProtocolException("data-missing", "VNF ID not found.", HttpStatus.NOT_FOUND.value());
-        }
-    }
-
-    /**
-     * Extracts VNF data from the Config table specified Service Instance.
-     * <p>
-     * Maps to
-     * /config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/
-     * 
-     * @param serviceInstanceId the Service Instance ID to lookup data for
-     * @param vnfId             the VNF ID of the VNF to return
-     * @return HttpStatus.OK (200) if the data is found.
-     * @throws RestException if the data does not exist.
-     */
-    @Override
-    public ResponseEntity<GenericResourceApiServicedataServicedataVnfsVnf> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataVnfsVnfVnfIdGet(
-            String serviceInstanceId, String vnfId) throws RestException {
-        log.info("GET | VNF Data for ({})", vnfId);
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        if ((services == null) || (services.isEmpty())) {
-            throw new RestProtocolException("data-missing", "No service entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        GenericResourceApiServicedataServicedataVnfsVnf vnf = null;
-        try {
-            vnf = serviceDataHelper.getVnf(serviceInstanceId, vnfId);
-        } catch (JsonProcessingException e) {
-            log.error("Could not parse service data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-
-        if (vnf != null) {
-            return new ResponseEntity<>(vnf, HttpStatus.OK);
-        } else {
-            log.info("No information found for {}", vnfId);
-            throw new RestApplicationException("data-missing",
-                    "Request could not be completed because the relevant data model content does not exist",
-                    HttpStatus.NOT_FOUND.value());
-        }
-    }
-
-    /**
-     * Creates or updates VNF data in the Config table for a specified Service
-     * Instance. If it is a new Service Instance or a new VNF, creates all necessary
-     * parent data containers, then performs the updates.
-     * <p>
-     * Maps to /config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/
-     * @param serviceInstanceId the Service Instance ID to perform the delete on
-     * @param vnfId the VNF ID of the VNF to delete
-     * @param genericResourceApiServicedataServicedataVnfsVnfBodyParam the playload
-     * @return HttpStatus.CREATED (201) on successful create
-     * <p>
-     * HttpStatus.NO_CONTENT (204) on successful update
-     * <p>
-     * HttpStatus.BAD_REQUEST (400) if {@code vnfId} does not match what is specified in the
-     * {@code genericResourceApiServicedataServicedataVnfsVnfBodyParam} , or if updating the database fails.
-     * @throws RestException
-     */
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataVnfsVnfVnfIdPut(
-            String serviceInstanceId, String vnfId,
-            GenericResourceApiServicedataServicedataVnfsVnf vnf)
-            throws RestException {
-        log.info("PUT | VNF Data for ({})", vnfId);
-        if (!vnfId.equals(vnf.getVnfId())) {
-            throw new RestProtocolException("bad-attribute", "vnf-id mismatch", HttpStatus.BAD_REQUEST.value());
-        }
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        ConfigServices data;
-        ServiceDataTransaction transaction = serviceDataHelper.createTransaction();
-        if ((services == null) || (services.isEmpty())) {
-            log.info("Could not find data for ({}). Creating new Service Object.", serviceInstanceId);
-            data = new ConfigServices();
-            data.setSvcInstanceId(serviceInstanceId);
-            transaction.save(data);
-        } else {
-            data = services.get(0);
-        }
-
-        try {
-            HttpStatus responseStatus = HttpStatus.NO_CONTENT;
-            if (serviceDataHelper.getVnf(serviceInstanceId, vnfId) == null) {
-                responseStatus = HttpStatus.CREATED;
-            }
-            serviceDataHelper.saveVnf(serviceInstanceId, vnf, transaction);
-            transaction.commit();
-            return new ResponseEntity<>(responseStatus);
-        } catch (JsonProcessingException e) {
-            log.error("Error saving vnf", e);
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-        }
-    }
-
-    /**
-     * Extracts VNF Topology data from the Config table specified Service Instance
-     * and VNF ID.
-     * <p>
-     * Maps to
-     * /config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/
-     * 
-     * @param serviceInstanceId the Service Instance ID to lookup data for
-     * @param vnfId             the VNF ID of the VNF to extract topology data from.
-     * @return HttpStatus.OK (200) if the data is found.
-     * @throws RestException if the data does not exist.
-     */
-    @Override
-    public ResponseEntity<GenericResourceApiVnftopologyVnfTopology> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataVnfsVnfVnfIdVnfDataVnfTopologyGet(
-            String serviceInstanceId, String vnfId) throws RestException {
-        log.info("GET | VNF Topology for ({})", vnfId);
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        if ((services == null) || (services.isEmpty())) {
-            throw new RestProtocolException("data-missing", "No service entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        GenericResourceApiServicedataServicedataVnfsVnf vnf = null;
-        
-        try {
-            vnf = serviceDataHelper.getVnf(serviceInstanceId, vnfId);
-        } catch (JsonProcessingException e) {
-            log.error("Could not parse service data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-
-        // Drill down to find the data
-        if (vnf != null && vnf.getVnfData() != null && vnf.getVnfData().getVnfTopology() != null) {
-            return new ResponseEntity<>(vnf.getVnfData().getVnfTopology(), HttpStatus.OK);
-        } else {
-            log.info("No information found for {}", vnfId);
-            throw new RestApplicationException("data-missing",
-                    "Request could not be completed because the relevant data model content does not exist",
-                    HttpStatus.NOT_FOUND.value());
-        }
-    }
-
-    /**
-     * Creates or updates VNF Level Operation Status data in the Config table for a
-     * specified Service Instance. If it is a new Service Instance or a new VNF,
-     * creates all necessary parent data containers, then performs the updates.
-     * <p>
-     * Maps to
-     * /config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-level-oper-status/
-     * 
-     * @param serviceInstanceId                         the Service Instance ID to
-     *                                                  perform the delete on
-     * @param vnfId                                     the VNF ID of the VNF to
-     *                                                  delete
-     * @param genericResourceApiOperStatusDataBodyParam the payload
-     * @return HttpStatus.CREATED (201) on successful create.
-     *         <p>
-     *         HttpStatus.NO_CONTENT (204) on successful update.
-     *         <p>
-     *         HttpStatus.BAD_REQUEST (400) if updating the database fails.
-     * @throws RestException
-     */
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataVnfsVnfVnfIdVnfDataVnfLevelOperStatusPut(
-            String serviceInstanceId, String vnfId,
-            GenericResourceApiOperStatusData genericResourceApiOperStatusDataBodyParam) throws RestException {
-        log.info("PUT | VNF Level Oper Status ({})", vnfId);
-        ServiceDataTransaction transaction = serviceDataHelper.createTransaction();
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        ConfigServices data;
-        if ((services == null) || (services.isEmpty())) {
-            log.info("Could not find data for ({}). Creating new Service Object.", serviceInstanceId);
-            data = new ConfigServices();
-            data.setSvcInstanceId(serviceInstanceId);
-            transaction.save(data);
-        } else {
-            data = services.get(0);
-        }
-
-        HttpStatus responseStatus = HttpStatus.NO_CONTENT;
-
-        try {
-            GenericResourceApiServicedataServicedataVnfsVnf vnf = serviceDataHelper.getVnf(serviceInstanceId, vnfId);
-            if (vnf == null) {
-                responseStatus = HttpStatus.CREATED;
-                vnf = new GenericResourceApiServicedataServicedataVnfsVnf();
-                vnf.setVnfId(vnfId);
-            } 
-            GenericResourceApiServicedataServicedataVnfsVnfVnfData vnfData = vnf.getVnfData();
-            if (vnfData == null) {
-                vnfData = new GenericResourceApiServicedataServicedataVnfsVnfVnfData();
-            }
-            vnfData.setVnfLevelOperStatus(genericResourceApiOperStatusDataBodyParam);
-            vnf.setVnfData(vnfData);
-            serviceDataHelper.saveVnf(serviceInstanceId, vnf, transaction);
-            transaction.commit();
-            return new ResponseEntity<>(responseStatus);
-        } catch (JsonProcessingException e) {
-            log.error("Error saving vnf", e);
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-        }
-    }
-
-    /**
-     * Creates or updates VNF Onap Model Information data in the Config table for a
-     * specified Service Instance. If it is a new Service Instance or a new VNF,
-     * creates all necessary parent data containers, then performs the updates.
-     * <p>
-     * Maps to
-     * /config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/onap-model-information/
-     * 
-     * @param serviceInstanceId                                                   the
-     *                                                                            Service
-     *                                                                            Instance
-     *                                                                            ID
-     *                                                                            to
-     *                                                                            perform
-     *                                                                            the
-     *                                                                            delete
-     *                                                                            on
-     * @param vnfId                                                               the
-     *                                                                            VNF
-     *                                                                            ID
-     *                                                                            of
-     *                                                                            the
-     *                                                                            VNF
-     *                                                                            to
-     *                                                                            delete
-     * @param genericResourceApiOnapmodelinformationOnapModelInformationBodyParam the
-     *                                                                            payload
-     * @return HttpStatus.CREATED (201) on successful create.
-     *         <p>
-     *         HttpStatus.NO_CONTENT (204) on successful update.
-     *         <p>
-     *         HttpStatus.BAD_REQUEST (400) if updating the database fails.
-     * @throws RestException
-     */
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataVnfsVnfVnfIdVnfDataVnfTopologyOnapModelInformationPut(
-            String serviceInstanceId, String vnfId,
-            GenericResourceApiOnapmodelinformationOnapModelInformation genericResourceApiOnapmodelinformationOnapModelInformationBodyParam)
-            throws RestException {
-        log.info("PUT | VNF Topology Onap Model Information ({})", vnfId);
-        ServiceDataTransaction transaction = serviceDataHelper.createTransaction();
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        ConfigServices data;
-        if ((services == null) || (services.isEmpty())) {
-            log.info("Could not find data for ({}). Creating new Service Object.", serviceInstanceId);
-            data = new ConfigServices();
-            data.setSvcInstanceId(serviceInstanceId);
-            transaction.save(data);
-        } else {
-            data = services.get(0);
-        }
-
-
-        GenericResourceApiServicedataServicedataVnfsVnf vnf = null;
-        HttpStatus responseStatus = HttpStatus.NO_CONTENT;
-        
-        try {
-            vnf = serviceDataHelper.getVnf(serviceInstanceId, vnfId);
-        } catch(JsonProcessingException e) {
-
-            log.error("Could not parse service data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-
-        if (vnf == null) {
-            responseStatus = HttpStatus.CREATED;
-            vnf = new GenericResourceApiServicedataServicedataVnfsVnf();
-            vnf.setVnfId(vnfId);
-            vnf.setVnfData(new GenericResourceApiServicedataServicedataVnfsVnfVnfData());
-            vnf.getVnfData().setVnfTopology(new GenericResourceApiVnftopologyVnfTopology());
-        }
-
-        vnf.getVnfData().getVnfTopology()
-                .setOnapModelInformation(genericResourceApiOnapmodelinformationOnapModelInformationBodyParam);
-
-        // Save the updated VNF (and service, if new)
-        try {
-            serviceDataHelper.saveVnf(serviceInstanceId, vnf, transaction);
-            transaction.commit();
-            return new ResponseEntity<>(responseStatus);
-        } catch (JsonProcessingException e) {
-            log.error("Error mapping object to JSON", e);
-            // Should probably be a 500 INTERNAL_SERVICE_ERROR
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-        }
-    }
-
-    /**
-     * Creates or updates VNF Network data in the Config table for a specified
-     * Service Instance. If it is a new Service Instance or a new VNF, creates all
-     * necessary parent data containers, then performs the updates.
-     * <p>
-     * Maps to /config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/
-     * @param serviceInstanceId the Service Instance ID to perform the delete on
-     * @param vnfId the VNF ID of the VNF to delete
-     * @param genericResourceApiVnfresourceassignmentsVnfresourceassignmentsVnfNetworksBodyParam the * payload
-     * @return HttpStatus.CREATED (201) on successful create.
-     * <p>
-     * HttpStatus.NO_CONTENT (204) on successful update.
-     * <p>
-     * HttpStatus.BAD_REQUEST (400) if updating the database fails.
-     * @throws RestException
-     */
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataVnfsVnfVnfIdVnfDataVnfTopologyVnfResourceAssignmentsVnfNetworksPut(
-            String serviceInstanceId, String vnfId,
-            GenericResourceApiVnfresourceassignmentsVnfresourceassignmentsVnfNetworks genericResourceApiVnfresourceassignmentsVnfresourceassignmentsVnfNetworksBodyParam)
-            throws RestException {
-        log.info("PUT | VNF Topology VNF Resource Assignments VNF Networks ({})", vnfId);
-
-        ServiceDataTransaction transaction = serviceDataHelper.createTransaction();
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        ConfigServices data;
-        if ((services == null) || (services.isEmpty())) {
-            log.info("Could not find data for ({}). Creating new Service Object.", serviceInstanceId);
-            data = new ConfigServices();
-            data.setSvcInstanceId(serviceInstanceId);
-            transaction.save(data);
-        } else {
-            data = services.get(0);
-        }
-
-        HttpStatus responseStatus = HttpStatus.NO_CONTENT;
-        GenericResourceApiServicedataServicedataVnfsVnf vnf = null;
-
-        try {
-            vnf = serviceDataHelper.getVnf(serviceInstanceId, vnfId);
-        } catch(JsonProcessingException e) {
-
-            log.error("Could not parse service data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-
-        if (vnf == null) {
-            log.info("Creating VNF data for ({})", vnfId);
-            vnf = new GenericResourceApiServicedataServicedataVnfsVnf();
-            vnf.setVnfId(vnfId);
-            responseStatus = HttpStatus.CREATED;
-        }
-        GenericResourceApiServicedataServicedataVnfsVnfVnfData vnfData = vnf.getVnfData();
-        if (vnfData == null) {
-            vnfData = new GenericResourceApiServicedataServicedataVnfsVnfVnfData();
-        }
-
-        GenericResourceApiVnftopologyVnfTopology vnfTopology = vnfData.getVnfTopology();
-        if (vnfTopology == null) {
-            vnfTopology = new GenericResourceApiVnftopologyVnfTopology();
-        }
-
-        GenericResourceApiVnfresourceassignmentsVnfResourceAssignments vnfResourceAssignments = vnfTopology.getVnfResourceAssignments();
-        if (vnfResourceAssignments == null) {
-            vnfResourceAssignments = new GenericResourceApiVnfresourceassignmentsVnfResourceAssignments();
-        }
-        vnfResourceAssignments.setVnfNetworks(genericResourceApiVnfresourceassignmentsVnfresourceassignmentsVnfNetworksBodyParam);
-        vnfTopology.setVnfResourceAssignments(vnfResourceAssignments);
-        vnfData.setVnfTopology(vnfTopology);
-        vnf.setVnfData(vnfData);
-
-        // Map and save the new data
-        try {
-            serviceDataHelper.saveVnf(serviceInstanceId, vnf, transaction);
-            transaction.commit();
-            return new ResponseEntity<>(responseStatus);
-        } catch (JsonProcessingException e) {
-            log.error("Error mapping object to JSON", e);
-            // Should probably be a 500 INTERNAL_SERVICE_ERROR
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-        }
-    }
-
-    /**
-     * Creates or updates VNF Network Role data in the Config table for a specified
-     * Service Instance. If it is a new Service Instance or a new VNF, creates all
-     * necessary parent data containers, then performs the updates.
-     * <p>
-     * Maps to
-     * /config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-topology/vnf-resource-assignments/vnf-networks/vnf-network/{network-role}/
-     * 
-     * @param serviceInstanceId                         the Service Instance ID to
-     *                                                  perform the delete on
-     * @param vnfId                                     the VNF ID of the VNF to
-     *                                                  delete
-     * @param genericResourceApiVnfNetworkDataBodyParam the payload
-     * @return HttpStatus.CREATED (201) on successful create.
-     *         <p>
-     *         HttpStatus.NO_CONTENT (204) on successful update.
-     *         <p>
-     *         HttpStatus.BAD_REQUEST (400) if updating the database fails.
-     * @throws RestException
-     */
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataVnfsVnfVnfIdVnfDataVnfTopologyVnfResourceAssignmentsVnfNetworksVnfNetworkNetworkRolePut(
-            String serviceInstanceId, String vnfId, String networkRole,
-            GenericResourceApiVnfNetworkData genericResourceApiVnfNetworkDataBodyParam) throws RestException {
-        log.info("PUT | VNF Network Network Role ({})", vnfId);
-        if (!networkRole.equals(genericResourceApiVnfNetworkDataBodyParam.getNetworkRole())) {
-            throw new RestProtocolException("bad-attribute", "network-role mismatch", HttpStatus.BAD_REQUEST.value());
-        }
-
-        ServiceDataTransaction transaction = serviceDataHelper.createTransaction();
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        ConfigServices data;
-        if ((services == null) || (services.isEmpty())) {
-            log.info("Could not find data for ({}). Creating new Service Object.", serviceInstanceId);
-            data = new ConfigServices();
-            data.setSvcInstanceId(serviceInstanceId);
-            transaction.save(data);
-        } else {
-            data = services.get(0);
-        }
-
-        HttpStatus responseStatus = HttpStatus.NO_CONTENT;
-        GenericResourceApiServicedataServicedataVnfsVnf vnf = null;
-
-        try {
-            vnf = serviceDataHelper.getVnf(serviceInstanceId, vnfId);
-        } catch(JsonProcessingException e) {
-
-            log.error("Could not parse service data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-
-        if (vnf == null) {
-            log.info("Creating VNF data for ({})", vnfId);
-            vnf = new GenericResourceApiServicedataServicedataVnfsVnf();
-            vnf.setVnfId(vnfId);
-            responseStatus = HttpStatus.CREATED;
-        }
-        GenericResourceApiServicedataServicedataVnfsVnfVnfData vnfData = vnf.getVnfData();
-        if (vnfData == null) {
-            vnfData = new GenericResourceApiServicedataServicedataVnfsVnfVnfData();
-        }
-
-        GenericResourceApiVnftopologyVnfTopology vnfTopology = vnfData.getVnfTopology();
-        if (vnfTopology == null) {
-            vnfTopology = new GenericResourceApiVnftopologyVnfTopology();
-        }
-
-        GenericResourceApiVnfresourceassignmentsVnfResourceAssignments vnfResourceAssignments = vnfTopology.getVnfResourceAssignments();
-        if (vnfResourceAssignments == null) {
-            vnfResourceAssignments = new GenericResourceApiVnfresourceassignmentsVnfResourceAssignments();
-        }
-
-        GenericResourceApiVnfresourceassignmentsVnfresourceassignmentsVnfNetworks vnfNetworks = vnfResourceAssignments.getVnfNetworks();
-        if (vnfNetworks == null) {
-            vnfNetworks = new GenericResourceApiVnfresourceassignmentsVnfresourceassignmentsVnfNetworks();
-            vnfNetworks.setVnfNetwork(new ArrayList<>());
-        }
-
-
-        if (vnfNetworks.getVnfNetwork().isEmpty()) {
-            vnfNetworks.addVnfNetworkItem(genericResourceApiVnfNetworkDataBodyParam);
-        } else {
-            GenericResourceApiVnfresourceassignmentsVnfresourceassignmentsVnfNetworks vnfNetworksNew = new GenericResourceApiVnfresourceassignmentsVnfresourceassignmentsVnfNetworks();
-            vnfNetworksNew.setVnfNetwork(new ArrayList<>());
-            vnfNetworks.getVnfNetwork().stream()
-              .filter(targetNetwork -> !targetNetwork.getNetworkRole().equals(networkRole)).forEach(vnfNetworksNew::addVnfNetworkItem);
-
-            vnfNetworksNew.addVnfNetworkItem(genericResourceApiVnfNetworkDataBodyParam);
-            vnfNetworks = vnfNetworksNew;
-        }
-
-        vnfResourceAssignments.setVnfNetworks(vnfNetworks);
-        vnfTopology.setVnfResourceAssignments(vnfResourceAssignments);
-        vnfData.setVnfTopology(vnfTopology);
-        vnf.setVnfData(vnfData);
-        try {
-            serviceDataHelper.saveVnf(serviceInstanceId, vnf, transaction);
-            transaction.commit();        
-            return new ResponseEntity<>(responseStatus);
-        } catch (JsonProcessingException e) {
-            log.error("Error mapping object to JSON", e);
-            // Should probably be a 500 INTERNAL_SERVICE_ERROR
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-        }
-    }
-
-
-    @Override
-    public ResponseEntity<GenericResourceApiServicetopologyServiceTopology> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataServiceTopologyGet(
-            String serviceInstanceId) throws RestApplicationException, RestProtocolException {
-        GenericResourceApiServicetopologyServiceTopology serviceTopology = null;
-        GenericResourceApiServicedataServiceData serviceData = null;
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        if ((services == null) || (services.isEmpty())) {
-            throw new RestProtocolException("data-missing", "No service entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        ConfigServices service = services.get(0);
-
-        try {
-            if ( (service.getSvcData() == null) || service.getSvcData().isEmpty()) {
-                throw new RestProtocolException("data-missing", "No service-data entry found",
-                        HttpStatus.NOT_FOUND.value());
-            } else {
-                serviceData = serviceDataHelper.getServiceData(service);
-                serviceTopology = serviceData.getServiceTopology();
-            }
-            if (serviceTopology == null) {
-                throw new RestProtocolException("data-missing", "No service-topology entry found",
-                        HttpStatus.NOT_FOUND.value());
-            }
-            return new ResponseEntity<>(serviceTopology, HttpStatus.OK);
-        } catch (JsonProcessingException e) {
-            log.error("Could not parse service data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-
-    }
-
-    /**
-     * Extracts VF MODULE data from CONFIG_GRA_SERVICES for a given, service-instance-id, vnf-id, and vf-module-id
-     * <p>
-     * Maps to /config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/
-     * @param serviceInstanceId the Service Instance ID to lookup data for
-     * @param vnfId the VNF ID of the VNF to return
-     * @param vfModuleId the vf-moudle ID of a specific VNF to return
-     * @return HttpStatus.OK (200) if the data is found.
-     * @throws RestException if the data does not exist.
-     */
-    @Override
-    public ResponseEntity<GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModule>
-    configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataVnfsVnfVnfIdVnfDataVfModulesVfModuleVfModuleIdGet(
-            String serviceInstanceId, String vnfId, String vfModuleId) throws RestException {
-
-        log.info("GET | Vf Module Data for ({})", vfModuleId);
-
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        if((services == null) || (services.isEmpty())) {
-            throw new RestProtocolException("data-missing", "No service entry found", HttpStatus.NOT_FOUND.value());
-        }
-
-        GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModule vfModule;
-        try {
-            vfModule = serviceDataHelper.getVfModule(serviceInstanceId, vnfId, vfModuleId);
-        } catch (JsonProcessingException e) {
-            log.error("Could not parse service data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-
-        if(vfModule != null) {
-            return new ResponseEntity<>(vfModule, HttpStatus.OK);
-        } else {
-            log.info("No vf-module found for [{}]", vfModuleId);
-            throw new RestApplicationException("data-missing",
-                    "Request could not be completed because the relevant data model content does not exist",
-                    HttpStatus.NOT_FOUND.value());
-        }
-    }
-
-    /**
-     * PUT VF MODULE data into CONFIG_GRA_SERVICES of a given, service-instance-id, vnf-id
-     * <p>
-     * Maps to /config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/
-     * @param serviceInstanceId the Service Instance ID
-     * @param vnfId the VNF ID as the parent of the specified vf-module-id and child of the specified service-instance
-     * @param vfModuleId the vf-moudle ID as a child of the specified VNF
-     * @return HttpStatus.OK (200) if the data is found.
-     * @throws RestException if the data does not exist.
-     */
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataVnfsVnfVnfIdVnfDataVfModulesVfModuleVfModuleIdPut(
-            String serviceInstanceId, String vnfId, String vfModuleId,
-            GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModule genericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModuleBodyParam)
-            throws RestException {
-        log.info("PUT | vf-module Data of ({}) for vnf ({}) in service({})", vfModuleId, vnfId, serviceInstanceId);
-
-        if(! vfModuleId.equals(genericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModuleBodyParam.getVfModuleId())) {
-            throw new RestProtocolException("bad-attribute", "vf-module-id mismatch", HttpStatus.BAD_REQUEST.value());
-        }
-
-
-        HttpStatus responseStatus = HttpStatus.NO_CONTENT;
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-
-        if((services == null) || (services.isEmpty())) {
-            log.error("service-instance-id ({}) not found in SDN.", serviceInstanceId);
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-        } 
-
-
-        GenericResourceApiServicedataServicedataVnfsVnf vnf;
-        try {
-            vnf = serviceDataHelper.getVnf(serviceInstanceId, vnfId);
-        } catch (JsonProcessingException e1) {
-            log.error("Could not parse service data", e1);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e1,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-
-        if(vnf == null) {
-            log.error("vnf-id ({}) not found in SDN.", vnfId);
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-        }
-
-        // See if this is the first vf module being added
-        List<ConfigVfModules> configVfModules = configVfModulesRepository.findBySvcInstanceIdAndVnfId(serviceInstanceId, vnfId);
-
-        if ((configVfModules == null) || configVfModules.isEmpty()) {
-            responseStatus = HttpStatus.CREATED;
-        }
-
-        // Add vf module
-        try {
-            serviceDataHelper.saveVfModule(serviceInstanceId, vnfId, genericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModuleBodyParam, null);
-            return new ResponseEntity<>(responseStatus);
-        } catch(JsonProcessingException e) {
-            log.error("Error mapping object to JSON", e);
-            // Should probably be a 500 INTERNAL_SERVICE_ERROR
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-        }
-    }
-
-    /**
-     * Extracts VF MODULE Topology data from the Config table specified Service
-     * Instance and VNF ID.
-     * <p>
-     * Maps to /config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/vf-module-data/vf-module-topology/
-     * @param serviceInstanceId the Service Instance ID to lookup data for
-     * @param vnfId the VNF ID of the VNF to extract topology data from.
-     * @param vfModuleId the vf-module-idof the vf-module to extract topology data from.
-     * @return HttpStatus.OK (200) if the data is found.
-     * @throws RestException if the data does not exist.
-     */
-    @Override
-    public ResponseEntity<GenericResourceApiVfmoduletopologyVfModuleTopology>
-    configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataVnfsVnfVnfIdVnfDataVfModulesVfModuleVfModuleIdVfModuleDataVfModuleTopologyGet(
-            String serviceInstanceId, String vnfId, String vfModuleId) throws RestException {
-        log.info("GET | vf-module-topology for ({})", vfModuleId);
-
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        if((services == null) || (services.isEmpty())) {
-            throw new RestApplicationException("data-missing",
-                    "Request could not be completed because the relevant data model content does not exist",
-                    HttpStatus.NOT_FOUND.value());
-        }
-
-        GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModule vfModule;
-        try {
-            vfModule = serviceDataHelper.getVfModule(serviceInstanceId, vnfId, vfModuleId);
-        } catch (JsonProcessingException e) {
-            log.error("Could not parse service data", e);
-            throw new RestApplicationException("data-conversion",
-                    "Request could not be completed due to internal error", e,
-                    HttpStatus.INTERNAL_SERVER_ERROR.value());
-        }
-        if (vfModule != null
-                && vfModule.getVfModuleData() != null
-                && vfModule.getVfModuleData().getVfModuleTopology() != null) {
-            return new ResponseEntity<>(vfModule.getVfModuleData().getVfModuleTopology(), HttpStatus.OK);
-        } else {
-            log.info("No information found for {}", vfModuleId);
-            throw new RestApplicationException("data-missing",
-                    "Request could not be completed because the relevant data model content does not exist",
-                    HttpStatus.NOT_FOUND.value());
-        }
-    }
-
-    @Override
-    public ResponseEntity<Void> configGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataVnfsVnfVnfIdVnfDataVfModulesVfModuleVfModuleIdDelete(
-            String serviceInstanceId, String vnfId, String vfModuleId) throws RestProtocolException {
-
-        log.info("DELETE | vf-module Data for ({})", vfModuleId);
-
-
- 
-        List<ConfigServices> services = configServicesRepository.findBySvcInstanceId(serviceInstanceId);
-
-        if((services == null) || (services.isEmpty())) {
-            log.error("service-instance-id ({}) not found in SDN.", serviceInstanceId);
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-        } 
-
-
-
-        serviceDataHelper.deleteVfModule(serviceInstanceId, vnfId, vfModuleId);
-        return new ResponseEntity<>(HttpStatus.OK);
-        
-    }
-}
-
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationalApiController.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationalApiController.java
deleted file mode 100644
index aeecd63..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationalApiController.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.controllers;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.onap.sdnc.apps.ms.gra.data.*;
-import org.onap.sdnc.apps.ms.gra.swagger.OperationalApi;
-import org.onap.sdnc.apps.ms.gra.swagger.model.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-@Controller
-@ComponentScan(basePackages = {"org.onap.sdnc.apps.ms.gra.*"})
-@EntityScan("org.onap.sdnc.apps.ms.gra.springboot.*")
-public class OperationalApiController implements OperationalApi {
-    private static final Logger log = LoggerFactory.getLogger(ConfigApiController.class);
-
-    private final ObjectMapper objectMapper;
-
-    private final HttpServletRequest request;
-
-    @Autowired
-    private OperationalPreloadDataRepository operationalPreloadDataRepository;
-
-    @Autowired
-    private OperationalServicesRepository operationalServicesRepository;
-
-    @Autowired
-    public OperationalApiController(ObjectMapper objectMapper, HttpServletRequest request) {
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        this.objectMapper = objectMapper;
-        this.request = request;
-    }
-
-    @Override
-    public Optional<ObjectMapper> getObjectMapper() {
-        return Optional.ofNullable(objectMapper);
-    }
-
-    @Override
-    public Optional<HttpServletRequest> getRequest() {
-        return Optional.ofNullable(request);
-    }
-
-
-    @Override
-    public ResponseEntity<GenericResourceApiPreloadModelInformation> operationalGENERICRESOURCEAPIpreloadInformationGet() {
-        GenericResourceApiPreloadModelInformation genericResourceApiPreloadModelInformation = new GenericResourceApiPreloadModelInformation();
-
-        operationalPreloadDataRepository.findAll().forEach(configPreloadData -> {
-            GenericResourceApiPreloadmodelinformationPreloadList preloadListItem = new GenericResourceApiPreloadmodelinformationPreloadList();
-
-            preloadListItem.setPreloadId(configPreloadData.getPreloadId());
-            preloadListItem.setPreloadType(configPreloadData.getPreloadType());
-            try {
-                preloadListItem.setPreloadData(objectMapper.readValue(configPreloadData.getPreloadData(), GenericResourceApiPreloaddataPreloadData.class));
-            } catch (JsonProcessingException e) {
-                log.error("Could not convert preload data", e);
-            }
-            genericResourceApiPreloadModelInformation.addPreloadListItem(preloadListItem);
-        });
-
-
-        return new ResponseEntity<>(genericResourceApiPreloadModelInformation, HttpStatus.OK);
-    }
-
-
-    @Override
-    public ResponseEntity<GenericResourceApiPreloadmodelinformationPreloadList> operationalGENERICRESOURCEAPIpreloadInformationPreloadListPreloadIdPreloadTypeGet(String preloadId, String preloadType) {
-        List<OperationalPreloadData> preloadData = operationalPreloadDataRepository.findByPreloadIdAndPreloadType(preloadId, preloadType);
-        if (preloadData != null) {
-            if (!preloadData.isEmpty()) {
-                OperationalPreloadData preloadDataItem = preloadData.get(0);
-                GenericResourceApiPreloadmodelinformationPreloadList preloadDataList = new GenericResourceApiPreloadmodelinformationPreloadList();
-                preloadDataList.setPreloadId(preloadDataItem.getPreloadId());
-                preloadDataList.setPreloadType(preloadDataItem.getPreloadType());
-                try {
-                    preloadDataList.setPreloadData(objectMapper.readValue(preloadDataItem.getPreloadData(), GenericResourceApiPreloaddataPreloadData.class));
-                } catch (JsonProcessingException e) {
-                    log.error("Cannot convert preload data", e);
-                }
-                return new ResponseEntity<>(preloadDataList, HttpStatus.OK);
-            }
-        }
-        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-    }
-
-
-    @Override
-    public ResponseEntity<GenericResourceApiPreloaddataPreloadData> operationalGENERICRESOURCEAPIpreloadInformationPreloadListPreloadIdPreloadTypePreloadDataGet(String preloadId, String preloadType) {
-        List<OperationalPreloadData> preloadData = operationalPreloadDataRepository.findByPreloadIdAndPreloadType(preloadId, preloadType);
-        if (preloadData != null) {
-            if (!preloadData.isEmpty()) {
-                OperationalPreloadData preloadDataItem = preloadData.get(0);
-                try {
-                    return new ResponseEntity<>(objectMapper.readValue(preloadDataItem.getPreloadData(), GenericResourceApiPreloaddataPreloadData.class), HttpStatus.OK);
-                } catch (JsonProcessingException e) {
-                    log.error("Cannot convert preload data", e);
-                }
-            }
-        }
-        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-    }
-
-
-    @Override
-    public ResponseEntity<GenericResourceApiServiceModelInfrastructure> operationalGENERICRESOURCEAPIservicesGet() {
-        GenericResourceApiServiceModelInfrastructure modelInfrastructure = new GenericResourceApiServiceModelInfrastructure();
-
-        AtomicBoolean caughtError = new AtomicBoolean(false);
-        operationalServicesRepository.findAll().forEach(service ->
-        {
-            GenericResourceApiServicemodelinfrastructureService serviceItem = new GenericResourceApiServicemodelinfrastructureService();
-            serviceItem.setServiceInstanceId(service.getSvcInstanceId());
-            try {
-                serviceItem.setServiceData(objectMapper.readValue(service.getSvcData(), GenericResourceApiServicedataServiceData.class));
-            } catch (JsonProcessingException e) {
-                log.error("Could not deserialize service data for {}", service.getSvcInstanceId(), e);
-                caughtError.set(true);
-            }
-            serviceItem.setServiceStatus(service.getServiceStatus());
-            modelInfrastructure.addServiceItem(serviceItem);
-        });
-
-        if (caughtError.get()) {
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
-        } else {
-            return new ResponseEntity<>(modelInfrastructure, HttpStatus.OK);
-        }
-    }
-
-
-
-    @Override
-    public ResponseEntity<GenericResourceApiServicemodelinfrastructureService> operationalGENERICRESOURCEAPIservicesServiceServiceInstanceIdGet(String serviceInstanceId) {
-        GenericResourceApiServicemodelinfrastructureService retval = null;
-
-        List<OperationalServices> services = operationalServicesRepository.findBySvcInstanceId(serviceInstanceId);
-
-        if (services.isEmpty()) {
-            return new ResponseEntity<> (HttpStatus.NOT_FOUND);
-        } else {
-            OperationalServices service = services.get(0);
-            retval = new GenericResourceApiServicemodelinfrastructureService();
-            retval.setServiceInstanceId(serviceInstanceId);
-            retval.setServiceStatus(service.getServiceStatus());
-            try {
-                retval.setServiceData(objectMapper.readValue(service.getSvcData(), GenericResourceApiServicedataServiceData.class));
-            } catch (JsonProcessingException e) {
-                log.error("Could not deserialize service data for service instance id {}", serviceInstanceId, e);
-                retval = null;
-            }
-        }
-
-        if (retval == null) {
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
-        } else {
-            return new ResponseEntity<>(retval, HttpStatus.OK);
-        }
-    }
-
-
-    @Override
-    public ResponseEntity<GenericResourceApiServicedataServiceData> operationalGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceDataGet(String serviceInstanceId) {
-        GenericResourceApiServicedataServiceData serviceData = null;
-
-        List<OperationalServices> services = operationalServicesRepository.findBySvcInstanceId(serviceInstanceId);
-        if (services.isEmpty()) {
-            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-        } else {
-            try {
-                serviceData = objectMapper.readValue(services.get(0).getSvcData(), GenericResourceApiServicedataServiceData.class);
-                return new ResponseEntity<>(serviceData, HttpStatus.OK);
-            } catch (JsonProcessingException e) {
-                log.error("Could not parse service data", e);
-                return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
-            }
-        }
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiServicestatusServiceStatus> operationalGENERICRESOURCEAPIservicesServiceServiceInstanceIdServiceStatusGet(String serviceInstanceId) {
-        GenericResourceApiServicestatusServiceStatus serviceStatus = null;
-        List<OperationalServices> services = operationalServicesRepository.findBySvcInstanceId(serviceInstanceId);
-
-        if (!services.isEmpty()) {
-            OperationalServices service = services.get(0);
-            serviceStatus = service.getServiceStatus();
-        }
-
-        if (serviceStatus == null) {
-            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-        } else {
-            return new ResponseEntity<>(serviceStatus, HttpStatus.OK);
-        }
-
-    }
-
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java
deleted file mode 100644
index 6b0a463..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java
+++ /dev/null
@@ -1,1858 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdnc.apps.ms.gra.controllers;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.TimeZone;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.onap.ccsdk.apps.services.RestException;
-import org.onap.ccsdk.apps.services.SvcLogicFactory;
-import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.SvcLogicException;
-import org.onap.ccsdk.sli.core.sli.SvcLogicLoader;
-import org.onap.ccsdk.sli.core.sli.provider.base.SvcLogicServiceBase;
-import org.onap.sdnc.apps.ms.gra.data.ConfigContrailRouteAllottedResourcesRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigNetworksRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigPortMirrorConfigurations;
-import org.onap.sdnc.apps.ms.gra.data.ConfigPortMirrorConfigurationsRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigPreloadData;
-import org.onap.sdnc.apps.ms.gra.data.ConfigPreloadDataRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigServices;
-import org.onap.sdnc.apps.ms.gra.data.ConfigServicesRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigVfModulesRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigVnfsRepository;
-import org.onap.sdnc.apps.ms.gra.data.OperationalContrailRouteAllottedResourcesRepository;
-import org.onap.sdnc.apps.ms.gra.data.OperationalPortMirrorConfigurationsRepository;
-import org.onap.sdnc.apps.ms.gra.data.OperationalPreloadData;
-import org.onap.sdnc.apps.ms.gra.data.OperationalPreloadDataRepository;
-import org.onap.sdnc.apps.ms.gra.data.OperationalServices;
-import org.onap.sdnc.apps.ms.gra.data.OperationalServicesRepository;
-import org.onap.sdnc.apps.ms.gra.swagger.OperationsApi;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiInstanceReference;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiNetworkOperationInformation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiNetworkOperationInformationBodyparam;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiNetworkTopologyOperation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiNetworktopologyoperationOutput;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPolicyUpdateNotifyOperation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPolicyupdatenotifyoperationInput;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPolicyupdatenotifyoperationInputBodyparam;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPolicyupdatenotifyoperationOutput;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPortMirrorTopologyOperation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPortMirrorTopologyOperationInformation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPortMirrorTopologyOperationInformationBodyparam;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPortmirrortopologyoperationOutput;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPreloadNetworkTopologyOperation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPreloadTopologyResponseBody;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPreloadVfModuleTopologyOperation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPreloaddataPreloadData;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPreloadnetworktopologyoperationInputBodyparam;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiPreloadvfmoduletopologyoperationInputBodyparam;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiRequestStatusEnumeration;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServiceOperationInformation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServiceOperationInformationBodyparam;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServiceTopologyOperation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicetopologyoperationOutput;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVfModuleOperationInformation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVfModuleOperationInformationBodyparam;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVfModuleTopologyOperation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVfmoduletopologyoperationOutput;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVnfGetResourceRequest;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVnfOperationInformation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVnfOperationInformationBodyparam;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVnfTopologyOperation;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVnfgetresourcerequestInput;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVnfgetresourcerequestInputBodyparam;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVnfgetresourcerequestOutput;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiVnftopologyoperationOutput;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-
-@Controller
-@ComponentScan(basePackages = { "org.onap.sdnc.apps.ms.gra.*", "org.onap.ccsdk.apps.services" })
-@EntityScan("org.onap.sdnc.apps.ms.gra.*")
-@Import(value = SvcLogicFactory.class)
-public class OperationsApiController implements OperationsApi {
-
-    private static final String CALLED_STR = "{} called.";
-    private static final String MODULE_NAME = "GENERIC-RESOURCE-API";
-    private static final String SERVICE_OBJECT_PATH_PARAM = "service-object-path";
-    private static final String NETWORK_OBJECT_PATH_PARAM = "network-object-path";
-    private static final String VNF_OBJECT_PATH_PARAM = "vnf-object-path";
-    private static final String PNF_OBJECT_PATH_PARAM = "pnf-object-path";
-    private static final String VF_MODULE_OBJECT_PATH_PARAM = "vf-module-object-path";
-    private static final String PORT_MIRROR_OBJECT_PATH_PARAM = "port-mirror-object-path";
-    private static final String BACKGROUND_THREAD_STARTED_MESSAGE = "Start background thread";
-    private static final String BACKGROUND_THREAD_INFO = "Background thread: input conf_id is {}";
-    private static final String SKIP_MDSAL_UPDATE_PROP = "skip-mdsal-update";
-    private static final String ADDING_INPUT_DATA_LOG = "Adding INPUT data for {} [{}] input: {}";
-    private static final String ADDING_OPERATIONAL_DATA_LOG = "Adding OPERATIONAL data for {} [{}] operational-data: {}";
-
-    private final ObjectMapper objectMapper;
-
-    private final HttpServletRequest request;
-
-    @Autowired
-    protected SvcLogicServiceBase svc;
-
-    @Autowired
-    protected SvcLogicLoader svcLogicLoader;
-
-    @Autowired
-    private ConfigPreloadDataRepository configPreloadDataRepository;
-
-    @Autowired
-    private OperationalPreloadDataRepository operationalPreloadDataRepository;
-
-    @Autowired
-    private ConfigServicesRepository configServicesRepository;
-
-    @Autowired
-    private OperationalServicesRepository operationalServicesRepository;
-
-    @Autowired
-    private ConfigNetworksRepository configNetworksRepository;
-
-    @Autowired 
-    private ConfigVnfsRepository configVnfsRepository;
-
-    @Autowired
-    private ConfigVfModulesRepository configVfModulesRepository;
-
-    @Autowired
-    private ConfigContrailRouteAllottedResourcesRepository configContrailRouteAllottedResourcesRepository;
-
-    @Autowired
-    private OperationalContrailRouteAllottedResourcesRepository operationalContrailRouteAllottedResourcesRepository;
-
-    @Autowired
-    private ConfigPortMirrorConfigurationsRepository configPortMirrorConfigurationsRepository;
-
-    @Autowired
-    private OperationalPortMirrorConfigurationsRepository operationalPortMirrorConfigurationsRepository;
-
-    @Autowired
-    private ServiceDataHelper serviceDataHelper;
-
-    private static class Iso8601Util {
-
-        private static TimeZone timeZone = TimeZone.getTimeZone("UTC");
-        private static DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-
-        private Iso8601Util() {
-        }
-
-        static {
-            dateFormat.setTimeZone(timeZone);
-        }
-
-        private static String now() {
-            return dateFormat.format(new Date());
-        }
-    }
-
-    @org.springframework.beans.factory.annotation.Autowired
-    public OperationsApiController(ObjectMapper objectMapper, HttpServletRequest request) {
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        this.objectMapper = objectMapper;
-        this.request = request;
-    }
-
-    @Override
-    public Optional<ObjectMapper> getObjectMapper() {
-        return Optional.ofNullable(objectMapper);
-    }
-
-    @Override
-    public Optional<HttpServletRequest> getRequest() {
-        return Optional.ofNullable(request);
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiPreloadNetworkTopologyOperation> operationsGENERICRESOURCEAPIpreloadNetworkTopologyOperationPost(
-            @Valid GenericResourceApiPreloadnetworktopologyoperationInputBodyparam graInput) {
-        final String svcOperation = "preload-network-topology-operation";
-        GenericResourceApiPreloadNetworkTopologyOperation retval = new GenericResourceApiPreloadNetworkTopologyOperation();
-        GenericResourceApiPreloadTopologyResponseBody resp = new GenericResourceApiPreloadTopologyResponseBody();
-
-        log.info(CALLED_STR, svcOperation);
-        if (hasInvalidPreloadNetwork(graInput)) {
-            log.debug("exiting {} because of null or empty preload-network-topology-information", svcOperation);
-
-            resp.setResponseCode("403");
-            resp.setResponseMessage("invalid input, null or empty preload-network-topology-information");
-            resp.setAckFinalIndicator("Y");
-
-            retval.setOutput(resp);
-
-            return new ResponseEntity<>(retval, HttpStatus.FORBIDDEN);
-        }
-
-        String preloadId = graInput.getInput().getPreloadNetworkTopologyInformation()
-                .getNetworkTopologyIdentifierStructure().getNetworkId();
-        String preloadType = "network";
-
-        resp.setSvcRequestId(graInput.getInput().getSdncRequestHeader().getSvcRequestId());
-
-        SvcLogicContext ctxIn = new SvcLogicContext();
-
-        GenericResourceApiPreloaddataPreloadData preloadData = null;
-
-        // Add input to SvcLogicContext
-        try {
-            ctxIn.mergeJson(svcOperation + "-input", objectMapper.writeValueAsString(graInput.getInput()));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on input preload data", svcOperation);
-            resp.setResponseCode("500");
-            resp.setResponseMessage("internal error");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-        // Add config tree data to SvcLogicContext
-        try {
-            preloadData = getConfigPreloadData(preloadId, preloadType);
-            ctxIn.mergeJson("preload-data", objectMapper.writeValueAsString(preloadData));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on saved config preload data", svcOperation);
-            resp.setResponseCode("500");
-            resp.setResponseMessage("internal error");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-        // Add operational tree data to SvcLogicContext
-        try {
-            preloadData = getOperationalPreloadData(preloadId, preloadType);
-            ctxIn.mergeJson("operational-data", objectMapper.writeValueAsString(preloadData));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on saved operational preload data", svcOperation);
-            resp.setResponseCode("500");
-            resp.setResponseMessage("internal error");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-        // Call DG
-        try {
-            // Any of these can throw a nullpointer exception
-            // execute should only throw a SvcLogicException
-            SvcLogicContext ctxOut = svc.execute(MODULE_NAME, svcOperation, null, "sync", ctxIn);
-            Properties respProps = ctxOut.toProperties();
-
-            resp.setAckFinalIndicator(respProps.getProperty("ack-final-indicator", "Y"));
-            resp.setResponseCode(respProps.getProperty("error-code", "200"));
-            resp.setResponseMessage(respProps.getProperty("error-message", "SUCCESS"));
-
-            if ("200".equals(resp.getResponseCode())) {
-                // If DG returns success, update database
-                String ctxJson = ctxOut.toJsonString("preload-data");
-                log.info("DG preload-data is {}", ctxJson);
-                GenericResourceApiPreloaddataPreloadData preloadToLoad = objectMapper.readValue(ctxJson,
-                        GenericResourceApiPreloaddataPreloadData.class);
-                saveConfigPreloadData(preloadId, preloadType, preloadToLoad);
-                saveOperationalPreloadData(preloadId, preloadType, preloadToLoad);
-            }
-
-        } catch (NullPointerException npe) {
-            log.error("Caught NPE", npe);
-            resp.setAckFinalIndicator("true");
-            resp.setResponseCode("500");
-            resp.setResponseMessage("Check that you populated module, rpc and or mode correctly.");
-        } catch (SvcLogicException e) {
-            log.error("Caught SvcLogicException", e);
-            resp.setAckFinalIndicator("true");
-            resp.setResponseCode("500");
-            resp.setResponseMessage(e.getMessage());
-        } catch (JsonMappingException e) {
-            log.error("Caught JsonMappingException", e);
-            resp.setAckFinalIndicator("true");
-            resp.setResponseCode("500");
-            resp.setResponseMessage(e.getMessage());
-        } catch (JsonProcessingException e) {
-            log.error("Caught JsonProcessingException", e);
-            resp.setAckFinalIndicator("true");
-            resp.setResponseCode("500");
-            resp.setResponseMessage(e.getMessage());
-        }
-
-        retval.setOutput(resp);
-        return (new ResponseEntity<>(retval, HttpStatus.valueOf(Integer.parseInt(resp.getResponseCode()))));
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiPreloadVfModuleTopologyOperation> operationsGENERICRESOURCEAPIpreloadVfModuleTopologyOperationPost(
-            @Valid GenericResourceApiPreloadvfmoduletopologyoperationInputBodyparam graInput) {
-        final String svcOperation = "preload-vf-module-topology-operation";
-        GenericResourceApiPreloadVfModuleTopologyOperation retval = new GenericResourceApiPreloadVfModuleTopologyOperation();
-        GenericResourceApiPreloadTopologyResponseBody resp = new GenericResourceApiPreloadTopologyResponseBody();
-
-        log.info(CALLED_STR, svcOperation);
-        if (hasInvalidPreloadNetwork(graInput)) {
-            log.debug("exiting {} because of null or empty preload-network-topology-information", svcOperation);
-
-            resp.setResponseCode("403");
-            resp.setResponseMessage("invalid input, null or empty preload-network-topology-information");
-            resp.setAckFinalIndicator("Y");
-
-            retval.setOutput(resp);
-
-            return new ResponseEntity<>(retval, HttpStatus.FORBIDDEN);
-        }
-
-        String preloadId = graInput.getInput().getPreloadVfModuleTopologyInformation().getVfModuleTopology()
-                .getVfModuleTopologyIdentifier().getVfModuleName();
-        String preloadType = "vf-module";
-
-        resp.setSvcRequestId(graInput.getInput().getSdncRequestHeader().getSvcRequestId());
-
-        SvcLogicContext ctxIn = new SvcLogicContext();
-
-        GenericResourceApiPreloaddataPreloadData preloadData = null;
-
-        // Add input to SvcLogicContext
-        try {
-            ctxIn.mergeJson(svcOperation + "-input", objectMapper.writeValueAsString(graInput.getInput()));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on input preload data", svcOperation);
-            resp.setResponseCode("500");
-            resp.setResponseMessage("internal error");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-        // Add config tree data to SvcLogicContext
-        try {
-            preloadData = getConfigPreloadData(preloadId, preloadType);
-            ctxIn.mergeJson("preload-data", objectMapper.writeValueAsString(preloadData));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on saved config preload data", svcOperation);
-            resp.setResponseCode("500");
-            resp.setResponseMessage("internal error");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-        // Add operational tree data to SvcLogicContext
-        try {
-            preloadData = getOperationalPreloadData(preloadId, preloadType);
-            ctxIn.mergeJson("operational-data", objectMapper.writeValueAsString(preloadData));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on saved operational preload data", svcOperation);
-            resp.setResponseCode("500");
-            resp.setResponseMessage("internal error");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-        // Call DG
-        try {
-            // Any of these can throw a nullpointer exception
-            // execute should only throw a SvcLogicException
-            SvcLogicContext ctxOut = svc.execute(MODULE_NAME, svcOperation, null, "sync", ctxIn);
-            Properties respProps = ctxOut.toProperties();
-
-            resp.setAckFinalIndicator(respProps.getProperty("ack-final-indicator", "Y"));
-            resp.setResponseCode(respProps.getProperty("error-code", "200"));
-            resp.setResponseMessage(respProps.getProperty("error-message", "SUCCESS"));
-
-            if ("200".equals(resp.getResponseCode())) {
-                // If DG returns success, update database
-                String ctxJson = ctxOut.toJsonString("preload-data");
-                GenericResourceApiPreloaddataPreloadData preloadToLoad = objectMapper.readValue(ctxJson,
-                        GenericResourceApiPreloaddataPreloadData.class);
-                saveConfigPreloadData(preloadId, preloadType, preloadToLoad);
-                saveOperationalPreloadData(preloadId, preloadType, preloadToLoad);
-            }
-
-        } catch (NullPointerException npe) {
-            resp.setAckFinalIndicator("true");
-            resp.setResponseCode("500");
-            resp.setResponseMessage("Check that you populated module, rpc and or mode correctly.");
-        } catch (SvcLogicException e) {
-            resp.setAckFinalIndicator("true");
-            resp.setResponseCode("500");
-            resp.setResponseMessage(e.getMessage());
-        } catch (JsonMappingException e) {
-            resp.setAckFinalIndicator("true");
-            resp.setResponseCode("500");
-            resp.setResponseMessage(e.getMessage());
-        } catch (JsonProcessingException e) {
-            resp.setAckFinalIndicator("true");
-            resp.setResponseCode("500");
-            resp.setResponseMessage(e.getMessage());
-        }
-
-        retval.setOutput(resp);
-        return (new ResponseEntity<>(retval, HttpStatus.valueOf(Integer.parseInt(resp.getResponseCode()))));
-    }
-
-    private boolean hasInvalidPreloadNetwork(
-            GenericResourceApiPreloadnetworktopologyoperationInputBodyparam preloadData) {
-        return ((preloadData == null) || (preloadData.getInput() == null)
-                || (preloadData.getInput().getPreloadNetworkTopologyInformation() == null));
-    }
-
-    private boolean hasInvalidPreloadNetwork(
-            GenericResourceApiPreloadvfmoduletopologyoperationInputBodyparam preloadData) {
-        return ((preloadData == null) || (preloadData.getInput() == null)
-                || (preloadData.getInput().getPreloadVfModuleTopologyInformation() == null));
-    }
-
-    private boolean hasInvalidServiceId(GenericResourceApiServiceOperationInformation input) {
-
-        return input == null || input.getServiceInformation() == null
-                || input.getServiceInformation().getServiceInstanceId() == null
-                || input.getServiceInformation().getServiceInstanceId().length() == 0;
-    }
-
-    private boolean hasInvalidServiceId(GenericResourceApiNetworkOperationInformation input) {
-
-        return input == null || input.getServiceInformation() == null
-                || input.getServiceInformation().getServiceInstanceId() == null
-                || input.getServiceInformation().getServiceInstanceId().length() == 0;
-    }
-
-    private boolean hasInvalidServiceId(GenericResourceApiVnfOperationInformation input) {
-
-        return input == null || input.getServiceInformation() == null
-                || input.getServiceInformation().getServiceInstanceId() == null
-                || input.getServiceInformation().getServiceInstanceId().length() == 0;
-    }
-
-    private boolean hasInvalidServiceId(GenericResourceApiVfModuleOperationInformation input) {
-
-        return input == null || input.getServiceInformation() == null
-                || input.getServiceInformation().getServiceInstanceId() == null
-                || input.getServiceInformation().getServiceInstanceId().length() == 0;
-    }
-
-    private boolean hasInvalidServiceId(GenericResourceApiPortMirrorTopologyOperationInformation input) {
-
-        return input == null || input.getServiceInformation() == null
-                || input.getServiceInformation().getServiceInstanceId() == null
-                || input.getServiceInformation().getServiceInstanceId().length() == 0;
-    }
-
-    private boolean hasInvalidServiceId(GenericResourceApiVnfgetresourcerequestInput input) {
-
-        return input == null || input.getServiceInformation() == null
-                || input.getServiceInformation().getServiceInstanceId() == null
-                || input.getServiceInformation().getServiceInstanceId().length() == 0;
-    }
-
-    private boolean hasInvalidVnfId(GenericResourceApiVfModuleOperationInformation input) {
-
-        return input == null || input.getVnfInformation() == null
-                || input.getVnfInformation().getVnfId() == null
-                || input.getVnfInformation().getVnfId().length() == 0;
-    }
-
-    private boolean hasInvalidConfigurationId(GenericResourceApiPortMirrorTopologyOperationInformation input) {
-        return input.getConfigurationInformation() == null
-                || input.getConfigurationInformation().getConfigurationId() == null
-                || input.getConfigurationInformation().getConfigurationId().length() == 0;
-    }
-
-    private boolean hasInvalidPolicyUpdateInput(GenericResourceApiPolicyupdatenotifyoperationInput input) {
-        return (input.getPolicyName() == null) || (input.getUpdateType() == null) || (input.getVersionId() == null);
-    }
-
-    private GenericResourceApiPreloaddataPreloadData getConfigPreloadData(String preloadId, String preloadType)
-            throws JsonProcessingException {
-
-        List<ConfigPreloadData> configPreloadData = configPreloadDataRepository.findByPreloadIdAndPreloadType(preloadId,
-                preloadType);
-
-        if (configPreloadData.isEmpty()) {
-            return (null);
-        } else {
-            return (objectMapper.readValue(configPreloadData.get(0).getPreloadData(),
-                    GenericResourceApiPreloaddataPreloadData.class));
-        }
-    }
-
-    private GenericResourceApiPreloaddataPreloadData getOperationalPreloadData(String preloadId, String preloadType)
-            throws JsonProcessingException {
-
-        List<OperationalPreloadData> configPreloadData = operationalPreloadDataRepository
-                .findByPreloadIdAndPreloadType(preloadId, preloadType);
-
-        if (configPreloadData.isEmpty()) {
-            return (null);
-        } else {
-            return (objectMapper.readValue(configPreloadData.get(0).getPreloadData(),
-                    GenericResourceApiPreloaddataPreloadData.class));
-        }
-    }
-
-    private void saveConfigPreloadData(String preloadId, String preloadType,
-            GenericResourceApiPreloaddataPreloadData preloadData) throws JsonProcessingException {
-
-        configPreloadDataRepository.deleteByPreloadIdAndPreloadType(preloadId, preloadType);
-        configPreloadDataRepository
-                .save(new ConfigPreloadData(preloadId, preloadType, objectMapper.writeValueAsString(preloadData)));
-
-    }
-
-    private void saveOperationalPreloadData(String preloadId, String preloadType,
-            GenericResourceApiPreloaddataPreloadData preloadData) throws JsonProcessingException {
-
-        operationalPreloadDataRepository.deleteByPreloadIdAndPreloadType(preloadId, preloadType);
-        operationalPreloadDataRepository
-                .save(new OperationalPreloadData(preloadId, preloadType, objectMapper.writeValueAsString(preloadData)));
-
-    }
-
-
-    @Override
-    public ResponseEntity<GenericResourceApiNetworkTopologyOperation> operationsGENERICRESOURCEAPInetworkTopologyOperationPost(
-            @Valid GenericResourceApiNetworkOperationInformationBodyparam input) throws RestException {
-        final String svcOperation = "network-topology-operation";
-        GenericResourceApiNetworkTopologyOperation retval = new GenericResourceApiNetworkTopologyOperation();
-        GenericResourceApiNetworktopologyoperationOutput resp = new GenericResourceApiNetworktopologyoperationOutput();
-
-        log.info(CALLED_STR, svcOperation);
-        // Verify input contains service instance id
-        if (hasInvalidServiceId(input.getInput())) {
-            log.debug("exiting {} because of null or empty service-instance-id", svcOperation);
-
-            resp.setResponseCode("404");
-            resp.setResponseMessage("null or empty service-instance-id");
-            resp.setAckFinalIndicator("Y");
-
-            retval.setOutput(resp);
-
-            return new ResponseEntity<>(retval, HttpStatus.OK);
-        }
-
-        String svcInstanceId = input.getInput().getServiceInformation().getServiceInstanceId();
-
-        SvcLogicContext ctxIn = new SvcLogicContext();
-
-        // Add input to SvcLogicContext
-        try {
-            ctxIn.mergeJson(svcOperation + "-input", objectMapper.writeValueAsString(input.getInput()));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on input data", svcOperation);
-            resp.setResponseCode("500");
-            resp.setResponseMessage("internal error");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-        // Add config tree data to SvcLogicContext
-        List<ConfigServices> configServices = configServicesRepository.findBySvcInstanceId(svcInstanceId);
-        ConfigServices configService = null;
-        String svcData = null;
-        if (configServices != null && !configServices.isEmpty()) {
-            configService = configServices.get(0);
-            try {
-                svcData = serviceDataHelper.getServiceDataAsString(svcInstanceId);
-            } catch (JsonProcessingException e) {
-                log.error("exiting {} due to parse error on service data", svcOperation);
-                resp.setResponseCode("500");
-                resp.setResponseMessage("internal error");
-                resp.setAckFinalIndicator("Y");
-                retval.setOutput(resp);
-                return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-            }
-        }
-        if (svcData != null) {
-            ctxIn.mergeJson("service-data", svcData);
-        } else {
-            log.debug("exiting {} because the service-instance does not have any service data in SDN", svcOperation);
-
-            resp.setResponseCode("404");
-            resp.setResponseMessage("invalid input: the service-instance does not have any service data in SDNC");
-            resp.setAckFinalIndicator("Y");
-
-            retval.setOutput(resp);
-
-            return new ResponseEntity<>(retval, HttpStatus.OK);
-        }
-
-        // Add operational tree data to SvcLogicContext
-        List<OperationalServices> operServices = operationalServicesRepository.findBySvcInstanceId(svcInstanceId);
-        OperationalServices operService = null;
-        boolean saveOperationalData = false;
-
-        if (operServices != null && !operServices.isEmpty()) {
-            operService = operServices.get(0);
-            ctxIn.mergeJson("operational-data", operService.getSvcData());
-        } else {
-            operService = new OperationalServices(svcInstanceId, null, null);
-        }
-
-        // Update service status info in config entry from input
-        configService.setServiceStatusAction(input.getInput().getRequestInformation().getRequestAction().toString());
-        configService.setServiceStatusRpcAction(input.getInput().getSdncRequestHeader().getSvcAction().toString());
-        configService.setServiceStatusRpcName(svcOperation);
-
-        String ctxSvcDataJson = svcData;
-
-        // Call DG
-        try {
-            // Any of these can throw a nullpointer exception
-            // execute should only throw a SvcLogicException
-            SvcLogicContext ctxOut = svc.execute(MODULE_NAME, svcOperation, null, "sync", ctxIn);
-            Properties respProps = ctxOut.toProperties();
-
-            resp.setAckFinalIndicator(respProps.getProperty("ack-final-indicator", "Y"));
-            resp.setResponseCode(respProps.getProperty("error-code", "200"));
-            resp.setResponseMessage(respProps.getProperty("error-message", "SUCCESS"));
-
-
-
-            configService
-                    .setServiceStatusRequestStatus(GenericResourceApiRequestStatusEnumeration.SYNCCOMPLETE.toString());
-
-            if ("200".equals(resp.getResponseCode())) {
-
-                GenericResourceApiInstanceReference serviceReference = new GenericResourceApiInstanceReference();
-                serviceReference.setInstanceId(svcInstanceId);
-                serviceReference.setObjectPath(respProps.getProperty(SERVICE_OBJECT_PATH_PARAM));
-                resp.setServiceResponseInformation(serviceReference);
-    
-                GenericResourceApiInstanceReference networkReference = new GenericResourceApiInstanceReference();
-                networkReference.setInstanceId(respProps.getProperty("networkId"));
-                networkReference.setObjectPath(respProps.getProperty(NETWORK_OBJECT_PATH_PARAM));
-                resp.setNetworkResponseInformation(networkReference);
-
-                // If DG returns success, update svcData in config and operational trees
-                // and remember to save operational data.
-                ctxSvcDataJson = ctxOut.toJsonString("service-data");
-                operService.setSvcData(ctxSvcDataJson);
-                saveOperationalData = true;
-            }
-
-        } catch (NullPointerException npe) {
-            resp.setAckFinalIndicator("true");
-            resp.setResponseCode("500");
-            resp.setResponseMessage("Check that you populated module, rpc and or mode correctly.");
-        } catch (SvcLogicException e) {
-            resp.setAckFinalIndicator("true");
-            resp.setResponseCode("500");
-            resp.setResponseMessage(e.getMessage());
-        }
-
-        // Update status in config services entry
-
-        configService.setServiceStatusFinalIndicator(resp.getAckFinalIndicator());
-        configService.setServiceStatusResponseCode(resp.getResponseCode());
-        configService.setServiceStatusResponseMessage(resp.getResponseMessage());
-        configService.setServiceStatusResponseTimestamp(Iso8601Util.now());
-
-
-        // Save service data
-        try {
-            serviceDataHelper.saveService(configService, ctxSvcDataJson);
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to  error saving service data", svcOperation);
-            resp.setResponseCode("500");
-            resp.setResponseMessage("internal error");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-        // If necessary, sync status to operation service entry and save
-        if (saveOperationalData) {
-            operService.setServiceStatus(configService.getServiceStatus());
-            operationalServicesRepository.save(operService);
-        }
-        retval.setOutput(resp);
-        
-        return (new ResponseEntity<>(retval, HttpStatus.OK));
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiServiceTopologyOperation> operationsGENERICRESOURCEAPIserviceTopologyOperationPost(
-            @Valid GenericResourceApiServiceOperationInformationBodyparam input) throws RestException {
-        final String svcOperation = "service-topology-operation";
-        GenericResourceApiServiceTopologyOperation retval = new GenericResourceApiServiceTopologyOperation();
-        GenericResourceApiServicetopologyoperationOutput resp = new GenericResourceApiServicetopologyoperationOutput();
-
-        log.info(CALLED_STR, svcOperation);
-
-        // Verify input contains service instance id
-        if (hasInvalidServiceId(input.getInput())) {
-            log.debug("exiting {} because of null or empty service-instance-id", svcOperation);
-
-            resp.setResponseCode("404");
-            resp.setResponseMessage("null or empty service-instance-id");
-            resp.setAckFinalIndicator("Y");
-
-            retval.setOutput(resp);
-
-            return new ResponseEntity<>(retval, HttpStatus.OK);
-        }
-
-        String svcInstanceId = input.getInput().getServiceInformation().getServiceInstanceId();
-
-        SvcLogicContext ctxIn = new SvcLogicContext();
-
-        // Add input to SvcLogicContext
-        try {
-            ctxIn.mergeJson(svcOperation + "-input", objectMapper.writeValueAsString(input.getInput()));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on input data", svcOperation);
-            resp.setResponseCode("500");
-            resp.setResponseMessage("internal error");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-        // Add config tree data to SvcLogicContext
-        List<ConfigServices> configServices = configServicesRepository.findBySvcInstanceId(svcInstanceId);
-        ConfigServices configService = null;
-        String svcData = null;
-        if (configServices != null && !configServices.isEmpty()) {
-            configService = configServices.get(0);
-            try {
-                svcData = serviceDataHelper.getServiceDataAsString(svcInstanceId);
-                if (svcData != null) {
-                    ctxIn.mergeJson("service-data", svcData);
-                }
-            } catch (JsonProcessingException e) {
-                log.error("exiting {} due to parse error on service data", svcOperation, e);
-                resp.setResponseCode("500");
-                resp.setResponseMessage("internal error");
-                resp.setAckFinalIndicator("Y");
-                retval.setOutput(resp);
-                return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-            }
-        } else {
-            configService = new ConfigServices(svcInstanceId);
-        }
-
-
-        // Add operational tree data to SvcLogicContext
-        List<OperationalServices> operServices = operationalServicesRepository.findBySvcInstanceId(svcInstanceId);
-        OperationalServices operService = null;
-        boolean saveOperationalData = false;
-
-        if (operServices != null && !operServices.isEmpty()) {
-            operService = operServices.get(0);
-            ctxIn.mergeJson("operational-data", operService.getSvcData());
-        } else {
-            operService = new OperationalServices(svcInstanceId, null, null);
-        }
-
-        // Update service status info in config entry from input
-        configService.setServiceStatusAction(input.getInput().getRequestInformation().getRequestAction().toString());
-        configService.setServiceStatusRpcAction(input.getInput().getSdncRequestHeader().getSvcAction().toString());
-        configService.setServiceStatusRpcName(svcOperation);
-
-        String ctxSvcDataJson = svcData;
-        // Call DG
-        try {
-            // Any of these can throw a nullpointer exception
-            // execute should only throw a SvcLogicException
-            SvcLogicContext ctxOut = svc.execute(MODULE_NAME, svcOperation, null, "sync", ctxIn);
-            Properties respProps = ctxOut.toProperties();
-
-            resp.setAckFinalIndicator(respProps.getProperty("ack-final-indicator", "Y"));
-            resp.setResponseCode(respProps.getProperty("error-code", "200"));
-            resp.setResponseMessage(respProps.getProperty("error-message", "SUCCESS"));
-
-            configService
-                    .setServiceStatusRequestStatus(GenericResourceApiRequestStatusEnumeration.SYNCCOMPLETE.toString());
-
-            if ("200".equals(resp.getResponseCode())) {                 
-                GenericResourceApiInstanceReference serviceReference = new GenericResourceApiInstanceReference();
-                serviceReference.setInstanceId(svcInstanceId);
-                serviceReference.setObjectPath(respProps.getProperty(SERVICE_OBJECT_PATH_PARAM));
-                resp.setServiceResponseInformation(serviceReference);
-
-                // If DG returns success, update svcData in config and operational trees
-                // and remember to save operational data.
-                ctxSvcDataJson= ctxOut.toJsonString("service-data");
-
-                operService.setSvcData(ctxSvcDataJson);
-                saveOperationalData = true;
-            }
-
-        } catch (NullPointerException npe) {
-            resp.setAckFinalIndicator("true");
-            resp.setResponseCode("500");
-            resp.setResponseMessage("Check that you populated module, rpc and or mode correctly.");
-        } catch (SvcLogicException e) {
-            resp.setAckFinalIndicator("true");
-            resp.setResponseCode("500");
-            resp.setResponseMessage(e.getMessage());
-        }
-
-        // Update status in config services entry
-
-        configService.setServiceStatusFinalIndicator(resp.getAckFinalIndicator());
-        configService.setServiceStatusResponseCode(resp.getResponseCode());
-        configService.setServiceStatusResponseMessage(resp.getResponseMessage());
-        configService.setServiceStatusResponseTimestamp(Iso8601Util.now());
-
-        // Save service data
-        try {
-            serviceDataHelper.saveService(configService, ctxSvcDataJson);
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to  error saving service data", svcOperation, e);
-            resp.setResponseCode("500");
-            resp.setResponseMessage("internal error");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-        // If necessary, sync status to operation service entry and save
-        if (saveOperationalData) {
-            operService.setServiceStatus(configService.getServiceStatus());
-            operationalServicesRepository.save(operService);
-        }
-        retval.setOutput(resp);
-        return (new ResponseEntity<>(retval, HttpStatus.OK));
-
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiVnfTopologyOperation> operationsGENERICRESOURCEAPIvnfTopologyOperationPost(
-            @Valid GenericResourceApiVnfOperationInformationBodyparam input)
-            throws RestException {
-        final String svcOperation = "vnf-topology-operation";
-        GenericResourceApiVnfTopologyOperation retval = new GenericResourceApiVnfTopologyOperation();
-        GenericResourceApiVnftopologyoperationOutput resp = new GenericResourceApiVnftopologyoperationOutput();
-
-        log.info(CALLED_STR, svcOperation);
-        // Verify input contains service instance id
-        if(hasInvalidServiceId(input.getInput())) {
-            log.debug("exiting {} because of null or empty service-instance-id", svcOperation);
-
-            resp.setResponseCode("404");
-            resp.setResponseMessage("null or empty service-instance-id");
-            resp.setAckFinalIndicator("Y");
-
-            retval.setOutput(resp);
-
-            return new ResponseEntity<>(retval, HttpStatus.OK);
-        }
-
-        String svcInstanceId = input.getInput().getServiceInformation().getServiceInstanceId();
-        String vnfId = null;
-
-        if((input.getInput() != null) && (input.getInput().getVnfInformation() != null)) {
-            vnfId = input.getInput().getVnfInformation().getVnfId();
-        }
-
-        SvcLogicContext ctxIn = new SvcLogicContext();
-
-        // Add input to SvcLogicContext
-        try {
-            ctxIn.mergeJson(svcOperation + "-input", objectMapper.writeValueAsString(input.getInput()));
-        }
-        catch(JsonProcessingException e) {
-            log.error("exiting {} due to parse error on input data", svcOperation);
-            resp.setResponseCode("500");
-            resp.setResponseMessage("internal error");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-       // Add config tree data to SvcLogicContext
-       List<ConfigServices> configServices = configServicesRepository.findBySvcInstanceId(svcInstanceId);
-       ConfigServices configService = null;
-       String svcData = null;
-       if (configServices != null && !configServices.isEmpty()) {
-           configService = configServices.get(0);
-           try {
-               svcData = serviceDataHelper.getServiceDataAsString(svcInstanceId);
-           } catch (JsonProcessingException e) {
-               log.error("exiting {} due to parse error on service data", svcOperation);
-               resp.setResponseCode("500");
-               resp.setResponseMessage("internal error");
-               resp.setAckFinalIndicator("Y");
-               retval.setOutput(resp);
-               return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-           }
-       }
-       if (svcData != null) {
-           ctxIn.mergeJson("service-data", svcData);
-       } else {
-           log.debug("exiting {} because the service-instance does not have any service data in SDN", svcOperation);
-
-           resp.setResponseCode("404");
-           resp.setResponseMessage("invalid input: the service-instance does not have any service data in SDNC");
-           resp.setAckFinalIndicator("Y");
-
-           retval.setOutput(resp);
-
-           return new ResponseEntity<>(retval, HttpStatus.OK);
-       }
-
-        // Add operational tree data to SvcLogicContext
-        List<OperationalServices> operServices = operationalServicesRepository.findBySvcInstanceId(svcInstanceId);
-        OperationalServices operService = null;
-        boolean saveOperationalData = false;
-
-        if(operServices != null && !operServices.isEmpty()) {
-            operService = operServices.get(0);
-            ctxIn.mergeJson("operational-data", operService.getSvcData());
-        }
-        else {
-            operService = new OperationalServices(svcInstanceId, null, null);
-        }
-
-        // Update service status info in config entry from input
-        configService.setServiceStatusAction(input.getInput().getRequestInformation().getRequestAction().toString());
-        configService.setServiceStatusRpcAction(input.getInput().getSdncRequestHeader().getSvcAction().toString());
-        configService.setServiceStatusRpcName(svcOperation);
-
-        String ctxSvcDataJson = svcData;
-
-        // Call DG
-        try {
-            // Any of these can throw a nullpointer exception
-            // execute should only throw a SvcLogicException
-            SvcLogicContext ctxOut = svc.execute(MODULE_NAME, svcOperation, null, "sync", ctxIn);
-            Properties respProps = ctxOut.toProperties();
-
-            resp.setAckFinalIndicator(respProps.getProperty("ack-final-indicator", "Y"));
-            resp.setResponseCode(respProps.getProperty("error-code", "200"));
-            resp.setResponseMessage(respProps.getProperty("error-message", "SUCCESS"));
-
-            configService
-                    .setServiceStatusRequestStatus(GenericResourceApiRequestStatusEnumeration.SYNCCOMPLETE.toString());
-
-            if("200".equals(resp.getResponseCode())) {
-
-                GenericResourceApiInstanceReference serviceReference = new GenericResourceApiInstanceReference();
-                serviceReference.setInstanceId(svcInstanceId);
-                serviceReference.setObjectPath(respProps.getProperty(SERVICE_OBJECT_PATH_PARAM));
-                resp.setServiceResponseInformation(serviceReference);
-
-                if(vnfId == null) {
-                    vnfId = respProps.getProperty("vnfId");
-                }
-                GenericResourceApiInstanceReference vnfReference = new GenericResourceApiInstanceReference();
-                vnfReference.setInstanceId(vnfId);
-                vnfReference.setObjectPath(respProps.getProperty(VNF_OBJECT_PATH_PARAM));
-                resp.setVnfResponseInformation(vnfReference);
-
-                // If DG returns success, update svcData in config and operational trees
-                // and remember to save operational data.
-                ctxSvcDataJson = ctxOut.toJsonString("service-data");
-                operService.setSvcData(ctxSvcDataJson);
-                saveOperationalData = true;
-            }
-
-        }
-        catch(NullPointerException npe) {
-            resp.setAckFinalIndicator("Y");
-            resp.setResponseCode("500");
-            resp.setResponseMessage("Check that you populated module, rpc and or mode correctly.");
-        }
-        catch(SvcLogicException e) {
-            resp.setAckFinalIndicator("Y");
-            resp.setResponseCode("500");
-            resp.setResponseMessage(e.getMessage());
-        }
-
-        // Update status in config services entry
-
-        configService.setServiceStatusFinalIndicator(resp.getAckFinalIndicator());
-        configService.setServiceStatusResponseCode(resp.getResponseCode());
-        configService.setServiceStatusResponseMessage(resp.getResponseMessage());
-        configService.setServiceStatusResponseTimestamp(Iso8601Util.now());
-
-        // Save service data
-        try {
-            serviceDataHelper.saveService(configService, ctxSvcDataJson);
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to  error saving service data", svcOperation);
-            resp.setResponseCode("500");
-            resp.setResponseMessage("internal error");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-
-        // If necessary, sync status to operation service entry and save
-        if(saveOperationalData) {
-            operService.setServiceStatus(configService.getServiceStatus());
-            operationalServicesRepository.save(operService);
-        }
-
-        if(resp.getAckFinalIndicator().equals("N")) {
-            // Spawn background thread to invoke the Async DG
-            Runnable backgroundThread = () -> {
-                log.info(BACKGROUND_THREAD_STARTED_MESSAGE);
-                processAsyncVnfTopologyOperation(svcOperation, input);
-            };
-            new Thread(backgroundThread).start();
-        }
-
-        log.info("Returned {} for {} [{}] {}.", resp.getResponseCode(), svcOperation, vnfId, resp.getResponseMessage());
-        retval.setOutput(resp);
-        return (new ResponseEntity<>(retval, HttpStatus.OK));
-    }
-
-    public void processAsyncVnfTopologyOperation(String parentOperation, @Valid GenericResourceApiVnfOperationInformationBodyparam input) {
-        final String svcOperation = "vnf-topology-operation-async";
-        GenericResourceApiVnftopologyoperationOutput resp = new GenericResourceApiVnftopologyoperationOutput();
-
-        log.info(CALLED_STR, svcOperation);
-        // Verify input contains service instance id
-        String svcInstanceId = input.getInput().getServiceInformation().getServiceInstanceId();
-        String vnfId = input.getInput().getVnfInformation().getVnfId();
-
-        SvcLogicContext ctxIn = new SvcLogicContext();
-
-        // Add input to SvcLogicContext
-        try {
-            ctxIn.mergeJson(parentOperation + "-input", objectMapper.writeValueAsString(input.getInput()));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on input data", svcOperation);
-            return;
-        }
-
-        // Add config tree data to SvcLogicContext
-        List<ConfigServices> configServices = configServicesRepository.findBySvcInstanceId(svcInstanceId);
-        ConfigServices configService = null;
-        String svcData = null;
-        if (configServices != null && !configServices.isEmpty()) {
-            configService = configServices.get(0);
-            try {
-                svcData = serviceDataHelper.getServiceDataAsString(svcInstanceId);
-            } catch (JsonProcessingException e) {
-                log.error("exiting {} due to parse error on service data", svcOperation);
-                return;
-            }
-        }
-        if (svcData != null) {
-            ctxIn.mergeJson("service-data", svcData);
-        } else {
-            log.error("exiting {} because there is no service data with id [{}] in SDN", svcOperation, svcInstanceId);
-            return;
-        }
-
-
-        // Add operational tree data to SvcLogicContext
-        List<OperationalServices> operServices = operationalServicesRepository.findBySvcInstanceId(svcInstanceId);
-        OperationalServices operService = null;
-
-        if(operServices != null && !operServices.isEmpty()) {
-            operService = operServices.get(0);
-            ctxIn.mergeJson("operational-data", operService.getSvcData());
-        }
-        else {
-            operService = new OperationalServices(svcInstanceId, null, null);
-        }
-
-        // Update service status info in config entry from input
-        configService.setServiceStatusAction(input.getInput().getRequestInformation().getRequestAction().toString());
-        configService.setServiceStatusRpcAction(input.getInput().getSdncRequestHeader().getSvcAction().toString());
-        configService.setServiceStatusRpcName(svcOperation);
-
-        String ctxSvcDataJson = svcData;
-
-        // Call DG
-        try {
-            // Any of these can throw a nullpointer exception
-            // execute should only throw a SvcLogicException
-            SvcLogicContext ctxOut = svc.execute(MODULE_NAME, svcOperation, null, "sync", ctxIn);
-            Properties respProps = ctxOut.toProperties();
-
-            resp.setAckFinalIndicator(respProps.getProperty("ack-final-indicator", "Y"));
-            resp.setResponseCode(respProps.getProperty("error-code", "200"));
-            resp.setResponseMessage(respProps.getProperty("error-message", "SUCCESS"));
-
-            configService
-                    .setServiceStatusRequestStatus(GenericResourceApiRequestStatusEnumeration.SYNCCOMPLETE.toString());
-
-            if("200".equals(resp.getResponseCode())) {
-                GenericResourceApiInstanceReference serviceReference = new GenericResourceApiInstanceReference();
-                serviceReference.setInstanceId(svcInstanceId);
-                serviceReference.setObjectPath(respProps.getProperty(SERVICE_OBJECT_PATH_PARAM));
-                resp.setServiceResponseInformation(serviceReference);
-
-                if(vnfId == null) {
-                    vnfId = respProps.getProperty("vnfId");
-                }
-                GenericResourceApiInstanceReference vnfReference = new GenericResourceApiInstanceReference();
-                vnfReference.setInstanceId(vnfId);
-                vnfReference.setObjectPath(respProps.getProperty(VNF_OBJECT_PATH_PARAM));
-                resp.setVnfResponseInformation(vnfReference);
-
-                // If DG returns success, update svcData in config and operational trees
-                // and remember to save operational data.
-                ctxSvcDataJson  = ctxOut.toJsonString("service-data");
-                operService.setSvcData(ctxSvcDataJson);
-
-                // Update status in config services entry
-
-                configService.setServiceStatusFinalIndicator(resp.getAckFinalIndicator());
-                configService.setServiceStatusResponseCode(resp.getResponseCode());
-                configService.setServiceStatusResponseMessage(resp.getResponseMessage());
-                configService.setServiceStatusResponseTimestamp(Iso8601Util.now());
-
-                // Save service data
-                try {
-                    serviceDataHelper.saveService(configService, ctxSvcDataJson);
-                } catch (JsonProcessingException e) {
-                    log.error("exiting {} due to  error saving service data", svcOperation);
-                    return;
-                }
-
-                // Update operational tree
-                operService.setServiceStatus(configService.getServiceStatus());
-                operationalServicesRepository.save(operService);
-                log.info("Returned SUCCESS for {} [{}]", svcOperation, vnfId);
-            }
-        }
-        catch(Exception e) {
-            log.error("Caught Exception updating configuration status in SDN for {} [{}] \n", svcOperation, vnfId);
-        }
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiVfModuleTopologyOperation> operationsGENERICRESOURCEAPIvfModuleTopologyOperationPost(
-            @Valid GenericResourceApiVfModuleOperationInformationBodyparam input)
-            throws RestException {
-        final String svcOperation = "vf-module-topology-operation";
-        GenericResourceApiVfModuleTopologyOperation retval = new GenericResourceApiVfModuleTopologyOperation();
-        GenericResourceApiVfmoduletopologyoperationOutput resp = new GenericResourceApiVfmoduletopologyoperationOutput();
-
-        log.info(CALLED_STR, svcOperation);
-
-        log.info("MYSQL_DATABASE = {}", System.getenv("MYSQL_DATABASE"));
-        // Verify input contains service instance id
-        if (hasInvalidServiceId(input.getInput())) {
-            log.debug("exiting {} because of null or empty service-instance-id", svcOperation);
-
-            resp.setResponseCode("404");
-            resp.setResponseMessage("null or empty service-instance-id");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.OK);
-        }
-
-        // Verify input contains vnf-id
-        if (hasInvalidVnfId(input.getInput())) {
-            log.debug("exiting {} because of null or empty vnf-id", svcOperation);
-
-            resp.setResponseCode("404");
-            resp.setResponseMessage("null or empty vnf-id");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.OK);
-        }
-
-        String svcInstanceId = input.getInput().getServiceInformation().getServiceInstanceId();
-        String vnfId = input.getInput().getVnfInformation().getVnfId();
-        String vfModuleId = input.getInput().getVfModuleInformation().getVfModuleId();
-
-        SvcLogicContext ctxIn = new SvcLogicContext();
-
-        // Add input to SvcLogicContext
-        try {
-            ctxIn.mergeJson(svcOperation + "-input", objectMapper.writeValueAsString(input.getInput()));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on input data", svcOperation);
-            resp.setResponseCode("500");
-            resp.setResponseMessage("internal error");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-        // Add config tree data to SvcLogicContext
-        List<ConfigServices> configServices = configServicesRepository.findBySvcInstanceId(svcInstanceId);
-        ConfigServices configService = null;
-        String svcData = null;
-        if (configServices != null && !configServices.isEmpty()) {
-            configService = configServices.get(0);
-            try {
-                svcData = serviceDataHelper.getServiceDataAsString(svcInstanceId);
-            } catch (JsonProcessingException e) {
-                log.error("exiting {} due to parse error on service data", svcOperation);
-                resp.setResponseCode("500");
-                resp.setResponseMessage("internal error");
-                resp.setAckFinalIndicator("Y");
-                retval.setOutput(resp);
-                return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-            }
-        }
-        if (svcData != null) {
-            ctxIn.mergeJson("service-data", svcData);
-        } else {
-            log.debug("exiting {} because the service-instance does not have any service data in SDN", svcOperation);
- 
-            resp.setResponseCode("404");
-            resp.setResponseMessage("invalid input: the service-instance does not have any service data in SDNC");
-            resp.setAckFinalIndicator("Y");
- 
-            retval.setOutput(resp);
- 
-            return new ResponseEntity<>(retval, HttpStatus.OK);
-        }
-
-        // Add operational tree data to SvcLogicContext
-        List<OperationalServices> operServices = operationalServicesRepository.findBySvcInstanceId(svcInstanceId);
-        OperationalServices operService = null;
-
-        if (operServices != null && !operServices.isEmpty()) {
-            operService = operServices.get(0);
-            log.info("Read ({}) data for [{}] operational-data: {}",
-                    "OPERATIONAL_GRA_PORT_MIRROR_CONFIGURATIONS", svcInstanceId, operService.getSvcData().toString());
-            //ctxIn.mergeJson("operational-data", operService.getSvcData());
-        } else {
-            log.info("No operational-data found in OPERATIONAL_GRA_PORT_MIRROR_CONFIGURATIONS for [{}]", svcInstanceId);
-            operService = new OperationalServices(svcInstanceId, null, null);
-        }
-
-        // Update service status info in config entry from input
-        configService.setServiceStatusAction(input.getInput().getRequestInformation().getRequestAction().toString());
-        configService.setServiceStatusRpcAction(input.getInput().getSdncRequestHeader().getSvcAction().toString());
-        configService.setServiceStatusRpcName(svcOperation);
-
-        String ackFinal = "Y";
-        String skipMdsalUpdate;
-        
-
-        // Call DG
-        try {
-            // Any of these can throw a nullpointer exception
-            // execute should only throw a SvcLogicException
-            SvcLogicContext ctxOut = svc.execute(MODULE_NAME, svcOperation, null, "sync", ctxIn);
-            Properties respProps = ctxOut.toProperties();
-
-            ackFinal = respProps.getProperty("ack-final", "Y");
-            skipMdsalUpdate = respProps.getProperty("skip-mdsal-update", "N");
-            log.info("ackFinal [{}], skipMdsalUpdate [{}]", ackFinal, skipMdsalUpdate);
-
-            resp.setAckFinalIndicator(ackFinal);
-            resp.setResponseCode(respProps.getProperty("error-code", "200"));
-            resp.setResponseMessage(respProps.getProperty("error-message", "SUCCESS"));
-
-            // Update status in config services entry
-            configService.setServiceStatusFinalIndicator(resp.getAckFinalIndicator());
-            configService.setServiceStatusResponseCode(resp.getResponseCode());
-            configService.setServiceStatusResponseMessage(resp.getResponseMessage());
-            configService.setServiceStatusResponseTimestamp(Iso8601Util.now());
-            configService
-                    .setServiceStatusRequestStatus(GenericResourceApiRequestStatusEnumeration.SYNCCOMPLETE.toString());
-
-            if ("200".equals(resp.getResponseCode())) {
-
-                GenericResourceApiInstanceReference serviceReference = new GenericResourceApiInstanceReference();
-                serviceReference.setInstanceId(svcInstanceId);
-                serviceReference.setObjectPath(respProps.getProperty(SERVICE_OBJECT_PATH_PARAM));
-                resp.setServiceResponseInformation(serviceReference);
-
-                GenericResourceApiInstanceReference vnfReference = new GenericResourceApiInstanceReference();
-                vnfReference.setInstanceId(vnfId);
-                vnfReference.setObjectPath(respProps.getProperty(VNF_OBJECT_PATH_PARAM));
-                resp.setVnfResponseInformation(vnfReference);
-
-                GenericResourceApiInstanceReference vfModuleReference = new GenericResourceApiInstanceReference();
-                vnfReference.setInstanceId(vfModuleId);
-                vnfReference.setObjectPath(respProps.getProperty(VF_MODULE_OBJECT_PATH_PARAM));
-                resp.setVnfResponseInformation(vfModuleReference);
-
-                if (skipMdsalUpdate.equals("N")) {
-                    // If DG returns success,
-                    // ONLY update svcData in config and operational trees
-                    // and remember to save operational data when skip-mdsal-update is Y in ctx.
-                    String ctxJson = ctxOut.toJsonString("service-data");
-                    log.info("Saving service-data in SDN because skipMdsalUpdate is {}", skipMdsalUpdate);
-                    log.info("Service data : {}", ctxJson);
-                    serviceDataHelper.saveService(configService, ctxJson);
-
-                    log.info("Copying service-data to operational-data");
-                    operService.setSvcData(ctxJson);
-                    operService.setServiceStatus(configService.getServiceStatus());
-                    operationalServicesRepository.save(operService);
-                }
-            }
-        } catch (NullPointerException npe) {
-            resp.setAckFinalIndicator("Y");
-            resp.setResponseCode("500");
-            resp.setResponseMessage("Check that you populated module, rpc and or mode correctly.");
-        } catch (SvcLogicException e) {
-            resp.setAckFinalIndicator("Y");
-        } catch (JsonProcessingException e) {
-            resp.setAckFinalIndicator("Y");
-            resp.setResponseCode("500");
-            resp.setResponseMessage("Internal error");
-            log.error("exiting {} due to error updating service data", svcOperation, e);
-        }
-
-        if (ackFinal.equals("N")) {
-            // Spawn background thread to invoke the Async DG
-            Runnable backgroundThread = new Runnable() {
-                public void run() {
-                    log.info(BACKGROUND_THREAD_STARTED_MESSAGE);
-                    processAsyncVfModuleTopologyOperation(svcOperation, input);
-                }
-            };
-            new Thread(backgroundThread).start();
-        }
-        retval.setOutput(resp);
-        return (new ResponseEntity<>(retval, HttpStatus.OK));
-    }
-
-    public void processAsyncVfModuleTopologyOperation( String parentOperation,
-            @Valid GenericResourceApiVfModuleOperationInformationBodyparam input) {
-        log.info(BACKGROUND_THREAD_INFO, input.getInput().getVfModuleInformation().getVfModuleId());
-        final String svcOperation = "vf-module-topology-operation-async";
-
-        log.info(CALLED_STR, svcOperation);
-        String svcInstanceId = input.getInput().getServiceInformation().getServiceInstanceId();
-        SvcLogicContext ctxIn = new SvcLogicContext();
-
-        // Add input to SvcLogicContext
-        try {
-            ctxIn.mergeJson(parentOperation + "-input", objectMapper.writeValueAsString(input.getInput()));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on input data", svcOperation);
-            return;
-        }
-
-        // Add config tree data to SvcLogicContext
-        List<ConfigServices> configServices = configServicesRepository.findBySvcInstanceId(svcInstanceId);
-        ConfigServices configService = null;
-        String svcData = null;
-        if (configServices != null && !configServices.isEmpty()) {
-            configService = configServices.get(0);
-            try {
-                svcData = serviceDataHelper.getServiceDataAsString(svcInstanceId);
-            } catch (JsonProcessingException e) {
-                log.error("exiting {} due to parse error on service data", svcOperation);
-                return;
-            }
-        }
-        if (svcData != null) {
-            ctxIn.mergeJson("service-data", svcData);
-        } else {
-            log.error("exiting {} because there is no service data with id [{}] in SDN", svcOperation, svcInstanceId);
-            return;
-        }
-
-
-        // Add operational tree data to SvcLogicContext
-        List<OperationalServices> operServices = operationalServicesRepository.findBySvcInstanceId(svcInstanceId);
-        OperationalServices operService = null;
-
-        if (operServices != null && !operServices.isEmpty()) {
-            operService = operServices.get(0);
-            log.info("Read ({}) data for [{}] operational-data: {}",
-                    "OPERATIONAL_GRA_PORT_MIRROR_CONFIGURATIONS", svcInstanceId, operService.getSvcData().toString());
-            //ctxIn.mergeJson("operational-data", operService.getSvcData());
-        } else {
-            log.info("No operational-data found in OPERATIONAL_GRA_PORT_MIRROR_CONFIGURATIONS for [{}]", svcInstanceId);
-            operService = new OperationalServices(svcInstanceId, null, null);
-        }
-
-        // Update service status info in config entry from input
-        configService.setServiceStatusAction(input.getInput().getRequestInformation().getRequestAction().toString());
-        configService.setServiceStatusRpcAction(input.getInput().getSdncRequestHeader().getSvcAction().toString());
-        configService.setServiceStatusRpcName(svcOperation);
-
-        String respStatus = "SUCCESS";
-        String errorMessage = null;
-
-        String ctxSvcDataJson = svcData;
-
-        log.info ("Adding INPUT data for {} [{}] input: {}", svcOperation, svcInstanceId, input.getInput().toString());
-
-        // Call DG
-        try {
-            // Any of these can throw a nullpointer exception
-            // execute should only throw a SvcLogicException
-            SvcLogicContext ctxOut = svc.execute(MODULE_NAME, svcOperation, null, "sync", ctxIn);
-            Properties respProps = ctxOut.toProperties();
-
-            String ackFinal = respProps.getProperty("ack-final-indicator", "Y");
-            String errorCode = respProps.getProperty("error-code", "200");
-            errorMessage = respProps.getProperty("error-message", "SUCCESS");
-
-            if (! "200".equals(errorCode)) {
-                respStatus = "FAILED";
-            }
-
-            // Update status in config services entry
-            configService.setServiceStatusFinalIndicator(ackFinal);
-            configService.setServiceStatusResponseTimestamp(Iso8601Util.now());
-            configService.setServiceStatusResponseCode(errorCode);
-            configService.setServiceStatusResponseMessage(errorMessage);
-            configService
-                    .setServiceStatusRequestStatus(GenericResourceApiRequestStatusEnumeration.SYNCCOMPLETE.toString());
-
-            ctxSvcDataJson = ctxOut.toJsonString("service-data");
-            configServicesRepository.save(configService);
-
-            // Save service data
-            try {
-                serviceDataHelper.saveService(configService, ctxSvcDataJson);
-            } catch (JsonProcessingException e) {
-                log.error("exiting {} due to  error saving service data", svcOperation);
-                return;
-            }
-
-            operService.setSvcData(ctxSvcDataJson);
-            operService.setServiceStatus(configService.getServiceStatus());
-            operationalServicesRepository.save(operService);
-
-        } catch (Exception ex) {
-            log.error("Caught Exception updating service status in SDN for {} [{}] \n", svcOperation, svcInstanceId);
-        }
-        log.info("Returned {} for {} [{}] {}.", respStatus, svcOperation, svcInstanceId, errorMessage);
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiPortMirrorTopologyOperation> operationsGENERICRESOURCEAPIportMirrorTopologyOperationPost(
-            @Valid GenericResourceApiPortMirrorTopologyOperationInformationBodyparam input)
-            throws RestException {
-        final String svcOperation = "port-mirror-topology-operation";
-        GenericResourceApiPortMirrorTopologyOperation retval = new GenericResourceApiPortMirrorTopologyOperation();
-        GenericResourceApiPortmirrortopologyoperationOutput resp = new GenericResourceApiPortmirrortopologyoperationOutput();
-
-        log.info(CALLED_STR, svcOperation);
-
-        // Verify input contains configuration-id
-        if (hasInvalidConfigurationId(input.getInput())) {
-            log.debug("exiting {} because of null or empty configuration-id", svcOperation);
-
-            resp.setResponseCode("404");
-            resp.setResponseMessage("null or empty configuration-id");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.OK);
-        }
-
-        // Verify input contains service instance id
-        if (hasInvalidServiceId(input.getInput())) {
-            log.debug("exiting {} because of null or empty service-instance-id", svcOperation);
-
-            resp.setResponseCode("404");
-            resp.setResponseMessage("null or empty service-instance-id");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.OK);
-        }
-
-        String svcInstanceId = input.getInput().getServiceInformation().getServiceInstanceId();
-        String configurationId = input.getInput().getConfigurationInformation().getConfigurationId();
-
-        SvcLogicContext ctxIn = new SvcLogicContext();
-
-        // Add input to SvcLogicContext
-        try {
-            ctxIn.mergeJson(svcOperation + "-input", objectMapper.writeValueAsString(input.getInput()));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on input data", svcOperation);
-            resp.setResponseCode("500");
-            resp.setResponseMessage("internal error");
-            resp.setAckFinalIndicator("Y");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-        // Add service instance config data to SvcLogicContext
-        List<ConfigServices> configServices = configServicesRepository.findBySvcInstanceId(svcInstanceId);
-        ConfigServices configService = null;
-        if (configServices != null && !configServices.isEmpty()) {
-            configService = configServices.get(0);
-            log.info("Read ({}) data for [{}] service-data: {}", "CONFIG_GRA_SERVICES", svcInstanceId, configService.getSvcData());
-            ctxIn.mergeJson("service-data", configService.getSvcData());
-
-        } else {
-            log.debug("exiting {} because there is no service data with id [{}] in SDN", svcOperation, svcInstanceId);
-            resp.setResponseCode("404");
-            resp.setResponseMessage("invalid input: there is no service-instance with id [{}] in SDNC");
-            resp.setAckFinalIndicator("Y");
-
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.OK);
-        }
-
-        // Add configuration config data to SvcLogicContext
-        List<ConfigPortMirrorConfigurations> configPortMirrorConfigurations =
-                configPortMirrorConfigurationsRepository.findByConfigurationId(configurationId);
-        ConfigPortMirrorConfigurations configPortMirrorConfiguration;
-        if (configPortMirrorConfigurations != null && !configPortMirrorConfigurations.isEmpty()) {
-            configPortMirrorConfiguration = configPortMirrorConfigurations.get(0);
-            log.info("Read ({}) data for [{}] configuration-data: {}",
-                    "CONFIG_GRA_PORT_MIRROR_CONFIGURATIONS", configurationId, configPortMirrorConfiguration.getPmcData());
-            ctxIn.mergeJson("configuration-data", configPortMirrorConfiguration.getPmcData());
-
-        } else {
-            log.info("No configuration-data found ({}) for [{}]", "CONFIG_GRA_PORT_MIRROR_CONFIGURATIONS", configurationId);
-            configPortMirrorConfiguration = new ConfigPortMirrorConfigurations(configurationId, null);
-        }
-
-        /*
-        // Add configuration operational data to SvcLogicContext
-        List<OperationalPortMirrorConfigurations> operPortMirrorConfigurations =
-                operationalPortMirrorConfigurationsRepository.findByConfigurationId(configurationId);
-        OperationalPortMirrorConfigurations operPortMirrorConfiguration;
-
-        if (operPortMirrorConfigurations != null && !operPortMirrorConfigurations.isEmpty()) {
-            operPortMirrorConfiguration = operPortMirrorConfigurations.get(0);
-            log.info("Read ({}) data for [{}] operational-data: {}",
-                    "OPERATIONAL_GRA_PORT_MIRROR_CONFIGURATIONS", configurationId, operPortMirrorConfiguration.getPmcData());
-            ctxIn.mergeJson("operational-data", operPortMirrorConfiguration.getPmcData());
-
-        } else {
-            log.info("No operational-data found ({}) for [{}]", "OPERATIONAL_GRA_PORT_MIRROR_CONFIGURATIONS", configurationId);
-            operPortMirrorConfiguration = new OperationalPortMirrorConfigurations(configurationId, null, null);
-        }
-
-        */
-
-        String ackFinal = "Y";
-        String errorCode = "200";
-        String errorMessage = "SUCCESS";
-        String respStatus = "SUCCESS";
-
-        log.info(ADDING_INPUT_DATA_LOG, svcOperation, svcInstanceId, input.getInput().toString());
-        //log.info(ADDING_INPUT_DATA_LOG, svcOperation, svcInstanceId, input.toString());
-
-        // Update service status info in config entry from input
-        configPortMirrorConfiguration.setPortMirrorConfigurationStatusAction(input.getInput().getRequestInformation().getRequestAction().toString());
-        configPortMirrorConfiguration.setPortMirrorConfigurationStatusRpcAction(input.getInput().getSdncRequestHeader().getSvcAction().toString());
-        configPortMirrorConfiguration.setPortMirrorConfigurationStatusRpcName(svcOperation);
-
-        // Call DG
-        try {
-            // Any of these can throw a nullpointer exception
-            // execute should only throw a SvcLogicException
-            SvcLogicContext ctxOut = svc.execute(MODULE_NAME, svcOperation, null, "sync", ctxIn);
-            Properties respProps = ctxOut.toProperties();
-
-            ackFinal = respProps.getProperty("ack-final", "Y");
-            errorCode = respProps.getProperty("error-code", "200");
-            errorMessage = respProps.getProperty("error-message", "SUCCESS");
-            log.info("ackFinal [{}], error-code [{}], error-message [{}]", ackFinal, errorCode, errorMessage);
-
-            resp.setAckFinalIndicator(ackFinal);
-            resp.setResponseCode(errorCode);
-            resp.setResponseMessage(errorMessage);
-
-            // Update status in config services entry
-            configPortMirrorConfiguration
-                    .setPortMirrorConfigurationStatusRequestStatus(GenericResourceApiRequestStatusEnumeration.SYNCCOMPLETE.toString());
-            configPortMirrorConfiguration.setPortMirrorConfigurationStatusFinalIndicator(resp.getAckFinalIndicator());
-            configPortMirrorConfiguration.setPortMirrorConfigurationStatusResponseCode(resp.getResponseCode());
-            configPortMirrorConfiguration.setPortMirrorConfigurationStatusResponseMessage(resp.getResponseMessage());
-            configPortMirrorConfiguration.setPortMirrorConfigurationStatusResponseTimestamp(Iso8601Util.now());
-
-            GenericResourceApiInstanceReference serviceReference = new GenericResourceApiInstanceReference();
-            serviceReference.setInstanceId(svcInstanceId);
-            serviceReference.setObjectPath(respProps.getProperty(SERVICE_OBJECT_PATH_PARAM));
-            resp.setServiceResponseInformation(serviceReference);
-
-            GenericResourceApiInstanceReference pmcReference = new GenericResourceApiInstanceReference();
-            serviceReference.setInstanceId(configurationId);
-            serviceReference.setObjectPath(respProps.getProperty(PORT_MIRROR_OBJECT_PATH_PARAM));
-            resp.setServiceResponseInformation(pmcReference);
-
-            retval.setOutput(resp);
-
-            // ONLY update pmcData in config and operational trees
-            //String ctxJson = ctxOut.toJsonString("configuration-data");
-            //configPortMirrorConfiguration.setPmcData(ctxJson);
-            //operPortMirrorConfiguration.setPmcData(ctxJson);
-            //configPortMirrorConfigurationsRepository.save(configPortMirrorConfiguration);
-
-            // If necessary, sync status to operation service entry and save
-            //operPortMirrorConfiguration.setPortMirrorConfigurationStatus(configPortMirrorConfiguration.getPortMirrorConfigurationStatus());
-            //operationalPortMirrorConfigurationsRepository.save(operPortMirrorConfiguration);
-
-            if (! "200".equals(errorCode)) {
-                respStatus = "FAILED";
-            }
-
-        } catch (NullPointerException npe) {
-            resp.setAckFinalIndicator("Y");
-            resp.setResponseCode("500");
-            resp.setResponseMessage("Check that you populated module, rpc and or mode correctly.");
-        } catch (SvcLogicException e) {
-            resp.setAckFinalIndicator("Y");
-        }
-
-        if (ackFinal.equals("N")) {
-            // Spawn background thread to invoke the Async DG
-            Runnable backgroundThread = new Runnable() {
-                public void run() {
-                    log.info(BACKGROUND_THREAD_STARTED_MESSAGE);
-                    processAsyncPortMirrorTopologyOperation(svcOperation, input);
-                 }
-            };
-            new Thread(backgroundThread).start();
-        }
-        log.info("Returned {} for {} [{}] {}.", respStatus, svcOperation, configurationId, errorMessage);
-        return (new ResponseEntity<>(retval, HttpStatus.OK));
-    }
-
-    public void processAsyncPortMirrorTopologyOperation( String parentOperation,
-             @Valid GenericResourceApiPortMirrorTopologyOperationInformationBodyparam input) {
-        log.info(BACKGROUND_THREAD_INFO, input.getInput().getConfigurationInformation().getConfigurationId());
-        final String svcOperation = "port-mirror-topology-operation-async";
-
-        log.info(CALLED_STR, svcOperation);
-        String svcInstanceId = input.getInput().getServiceInformation().getServiceInstanceId();
-        String configurationId = input.getInput().getConfigurationInformation().getConfigurationId();
-        SvcLogicContext ctxIn = new SvcLogicContext();
-
-        String errorMessage;
-
-        // Add input to SvcLogicContext
-        try {
-            ctxIn.mergeJson(parentOperation + "-input", objectMapper.writeValueAsString(input.getInput()));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on input data", svcOperation);
-            return;
-        }
-
-        // Add service instance config data to SvcLogicContext
-        List<ConfigServices> configServices = configServicesRepository.findBySvcInstanceId(svcInstanceId);
-        ConfigServices configService = null;
-        if (configServices != null && !configServices.isEmpty()) {
-            configService = configServices.get(0);
-            ctxIn.mergeJson("service-data", configService.getSvcData());
-        } else {
-            log.error("exiting {} because there is no service data with id [{}] in SDN", svcOperation, svcInstanceId);
-            return;
-        }
-
-        // Add config tree data to SvcLogicContext
-        List<ConfigPortMirrorConfigurations> configPortMirrorConfigurations = configPortMirrorConfigurationsRepository.findByConfigurationId(configurationId);
-        ConfigPortMirrorConfigurations configPortMirrorConfiguration;
-        if (configPortMirrorConfigurations != null && !configPortMirrorConfigurations.isEmpty()) {
-            configPortMirrorConfiguration = configPortMirrorConfigurations.get(0);
-            ctxIn.mergeJson("configuration-data", configPortMirrorConfiguration.getPmcData());
-        } else {
-            configPortMirrorConfiguration = new ConfigPortMirrorConfigurations(configurationId, null);
-        }
-
-        /*
-        // Add operational tree data to SvcLogicContext
-        List<OperationalPortMirrorConfigurations> operPortMirrorConfigurations = operationalPortMirrorConfigurationsRepository.findByConfigurationId(configurationId);
-        OperationalPortMirrorConfigurations operPortMirrorConfiguration = null;
-
-        if (operPortMirrorConfigurations != null && !operPortMirrorConfigurations.isEmpty()) {
-            operPortMirrorConfiguration = operPortMirrorConfigurations.get(0);
-            ctxIn.mergeJson("operational-data", operPortMirrorConfiguration.getPmcData());
-        } else {
-            operPortMirrorConfiguration = new OperationalPortMirrorConfigurations(configurationId, null, null);
-        }
-
-        */
-
-        // Update service status info in config entry from input
-        configPortMirrorConfiguration.setPortMirrorConfigurationStatusAction(input.getInput().getRequestInformation().getRequestAction().toString());
-        configPortMirrorConfiguration.setPortMirrorConfigurationStatusRpcAction(input.getInput().getSdncRequestHeader().getSvcAction().toString());
-        configPortMirrorConfiguration.setPortMirrorConfigurationStatusRpcName(parentOperation);
-
-        log.info("Adding INPUT data for {} [{}] input: {}", svcOperation, svcInstanceId, input.toString());
-
-        // Call DG
-        try {
-            // Any of these can throw a nullpointer exception
-            // execute should only throw a SvcLogicException
-            SvcLogicContext ctxOut = svc.execute(MODULE_NAME, svcOperation, null, "sync", ctxIn);
-            Properties respProps = ctxOut.toProperties();
-
-            String ackFinalIndicator = respProps.getProperty("ack-final-indicator", "Y");
-            String errorCode = respProps.getProperty("error-code", "200");
-            errorMessage = respProps.getProperty("error-message", "SUCCESS");
-
-            // Update status in config services entry
-            configPortMirrorConfiguration.setPortMirrorConfigurationStatusFinalIndicator(ackFinalIndicator);
-            configPortMirrorConfiguration.setPortMirrorConfigurationStatusResponseTimestamp(Iso8601Util.now());
-            configPortMirrorConfiguration.setPortMirrorConfigurationStatusResponseCode(errorCode);
-            configPortMirrorConfiguration.setPortMirrorConfigurationStatusResponseMessage(errorMessage);
-            configPortMirrorConfiguration
-                    .setPortMirrorConfigurationStatusRequestStatus(GenericResourceApiRequestStatusEnumeration.SYNCCOMPLETE.toString());
-
-            // ONLY update status
-            //String ctxJson = ctxOut.toJsonString("configuration-data");
-            //configPortMirrorConfiguration.setPmcData(ctxJson);
-            //configPortMirrorConfiguration.setPmcData(ctxJson);
-
-            // Update config tree
-            configPortMirrorConfigurationsRepository.save(configPortMirrorConfiguration);
-
-            //update operational tree
-            //operPortMirrorConfiguration.setPortMirrorConfigurationStatus(configPortMirrorConfiguration.getPortMirrorConfigurationStatus());
-            //operationalPortMirrorConfigurationsRepository.save(operPortMirrorConfiguration);
-
-        } catch (Exception e) {
-            log.error("Caught Exception updating configuration status in SDN for {} [{}] \n", svcOperation, configurationId);
-        }
-        log.info("Returned SUCCESS for {} [{}]", svcOperation, configurationId);
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiVnfGetResourceRequest> operationsGENERICRESOURCEAPIvnfGetResourceRequestPost(
-            @Valid GenericResourceApiVnfgetresourcerequestInputBodyparam input)
-            throws RestException {
-        final String svcOperation = "vnf-get-resource-request";
-        GenericResourceApiVnfGetResourceRequest retval = new GenericResourceApiVnfGetResourceRequest();
-
-        log.info(CALLED_STR, svcOperation);
-        // Verify input contains service instance id
-        if (hasInvalidServiceId(input.getInput())) {
-            log.debug("exiting {} because of null or empty service-instance-id", svcOperation);
-            //return new ResponseEntity<>(retval, HttpStatus.OK);
-        }
-
-        String svcInstanceId = input.getInput().getServiceInformation().getServiceInstanceId();
-        SvcLogicContext ctxIn = new SvcLogicContext();
-
-        // Add input to SvcLogicContext
-        try {
-            ctxIn.mergeJson(svcOperation + "-input", objectMapper.writeValueAsString(input.getInput()));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on input data", svcOperation);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-        // Add config tree data to SvcLogicContext
-        List<ConfigServices> configServices = configServicesRepository.findBySvcInstanceId(svcInstanceId);
-        ConfigServices configService = null;
-        if (configServices != null && !configServices.isEmpty()) {
-            configService = configServices.get(0);
-            try {
-                ctxIn.mergeJson("service-data", serviceDataHelper.getServiceDataAsString(svcInstanceId));
-            } catch (JsonProcessingException e) {
-                log.error("exiting {} due to parse error on service data", svcOperation);
-                return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-            }
-        } else {
-            log.debug("exiting {} because the service-instance does not have any service data in SDN", svcOperation);
-            return new ResponseEntity<>(retval, HttpStatus.OK);
-        }
-
-        // Call DG
-        try {
-            // Any of these can throw a nullpointer exception
-            // execute should only throw a SvcLogicException
-            SvcLogicContext ctxOut = svc.execute(MODULE_NAME, svcOperation, null, "sync", ctxIn);
-
-
-            String ctxJson = ctxOut.toJsonString("vnf-get-resource-request-output");
-            GenericResourceApiVnfgetresourcerequestOutput vnfgetresourcerequestOutput =
-                    objectMapper.readValue(ctxJson, GenericResourceApiVnfgetresourcerequestOutput.class);
-
-            retval.setOutput(vnfgetresourcerequestOutput);
-
-        } catch (Exception e) {
-            return (new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR));
-        }
-        return (new ResponseEntity<>(retval, HttpStatus.OK));
-    }
-
-    @Override
-    public ResponseEntity<GenericResourceApiPolicyUpdateNotifyOperation> operationsGENERICRESOURCEAPIpolicyUpdateNotifyOperationPost(
-            @Valid GenericResourceApiPolicyupdatenotifyoperationInputBodyparam input)
-            throws RestException {
-        final String svcOperation = "policy-update-notify-operation";
-        GenericResourceApiPolicyUpdateNotifyOperation retval = new GenericResourceApiPolicyUpdateNotifyOperation();
-        GenericResourceApiPolicyupdatenotifyoperationOutput resp = new GenericResourceApiPolicyupdatenotifyoperationOutput();
-
-        log.info(CALLED_STR, svcOperation);
-        // Verify required input elements
-        if (hasInvalidPolicyUpdateInput(input.getInput())) {
-            log.debug("exiting {} because policy name, update type, or version id was not provided", svcOperation);
-            resp.setErrorCode("404");
-            resp.setErrorMsg("policy-name, update-type, and/or version-id is null or empty");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.OK);
-        }
-
-        SvcLogicContext ctxIn = new SvcLogicContext();
-
-        // Add input to SvcLogicContext
-        try {
-            ctxIn.mergeJson(svcOperation + "-input", objectMapper.writeValueAsString(input.getInput()));
-        } catch (JsonProcessingException e) {
-            log.error("exiting {} due to parse error on input data", svcOperation);
-            resp.setErrorCode("500");
-            resp.setErrorMsg("internal error");
-            retval.setOutput(resp);
-            return new ResponseEntity<>(retval, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-
-        // Call DG
-        try {
-            // Any of these can throw a nullpointer exception
-            // execute should only throw a SvcLogicException
-            SvcLogicContext ctxOut = svc.execute(MODULE_NAME, svcOperation, null, "sync", ctxIn);
-            Properties respProps = ctxOut.toProperties();
-            resp.setErrorCode(respProps.getProperty("error-code", "200"));
-            resp.setErrorMsg(respProps.getProperty("error-message", "SUCCESS"));
-
-            /* For debugging Only
-            respProps.forEach((k,v) -> {
-                log.debug("prop: {} -> {}",k,v);
-            });
-             */
-
-        } catch (NullPointerException npe) {
-            resp.setErrorCode("500");
-            resp.setErrorMsg("Check that you populated module, rpc and or mode correctly.");
-        } catch (SvcLogicException e) {
-            resp.setErrorCode("500");
-            resp.setErrorMsg(e.getMessage());
-        }
-
-        retval.setOutput(resp);
-        return (new ResponseEntity<>(retval, HttpStatus.OK));
-    }
-
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ServiceDataHelper.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ServiceDataHelper.java
deleted file mode 100644
index f04a3ac..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ServiceDataHelper.java
+++ /dev/null
@@ -1,567 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.controllers;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.onap.sdnc.apps.ms.gra.data.ConfigNetworks;
-import org.onap.sdnc.apps.ms.gra.data.ConfigNetworksRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigServices;
-import org.onap.sdnc.apps.ms.gra.data.ConfigServicesRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigVfModules;
-import org.onap.sdnc.apps.ms.gra.data.ConfigVfModulesRepository;
-import org.onap.sdnc.apps.ms.gra.data.ConfigVnfs;
-import org.onap.sdnc.apps.ms.gra.data.ConfigVnfsRepository;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServiceData;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServicedataNetworks;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServicedataNetworksNetwork;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServicedataNetworksNetworkNetworkData;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServicedataVnfs;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServicedataVnfsVnf;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServicedataVnfsVnfVnfData;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfModules;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModule;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfmoduleVfModuleData;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-@Component
-@ComponentScan(basePackages = { "org.onap.sdnc.apps.ms.gra.*", "org.onap.ccsdk.apps.services" })
-
-public class ServiceDataHelper {
-
-    @Autowired
-    private ObjectMapper objectMapper;
-
-    @Autowired
-    private ConfigServicesRepository configServicesRepository;
-    
-    @Autowired
-    private ConfigNetworksRepository configNetworksRepository;
-
-    @Autowired
-    private ConfigVnfsRepository configVnfsRepository;
-
-    @Autowired
-    private ConfigVfModulesRepository configVfModulesRepository;
-
-    public ServiceDataHelper() {
-
-    }
-
-    public class ServiceDataTransaction {
-        private List<ConfigServices> servicesToSave = new LinkedList<ConfigServices>();
-        private List<ConfigNetworks> networksToSave = new LinkedList<ConfigNetworks>();
-        private List<ConfigVnfs> vnfsToSave = new LinkedList<ConfigVnfs>();
-        private List<ConfigVfModules> vfModulesToSave = new LinkedList<ConfigVfModules>();
-
-        private List<ConfigServices> servicesToRemove = new LinkedList<ConfigServices>();
-        private List<ConfigNetworks> networksToRemove = new LinkedList<ConfigNetworks>();
-        private List<ConfigVnfs> vnfsToRemove = new LinkedList<ConfigVnfs>();
-        private List<ConfigVfModules> vfModulesToRemove = new LinkedList<ConfigVfModules>();
-
-        // Deferred saves not working for now - do all immediate
-        public void save(ConfigServices service) {
-            // servicesToSave.add(service);
-            configServicesRepository.save(service);
-        }
-
-        public void save(ConfigNetworks network) {
-            // networksToSave.add(network);
-            configNetworksRepository.save(network);
-        }
-
-        public void save(ConfigVnfs vnf) {
-            // vnfsToSave.add(vnf);
-            configVnfsRepository.save(vnf);
-        }
-
-        public void save(ConfigVfModules vfModule) {
-            // vfModulesToSave.add(vfModule);
-            configVfModulesRepository.save(vfModule);
-        }
-
-        public void remove(ConfigServices service) {
-            // servicesToRemove.add(service);
-            configServicesRepository.delete(service);
-        }
-
-        public void remove(ConfigNetworks network) {
-            // networksToRemove.add(network);
-            configNetworksRepository.delete(network);
-        }
-
-        public void remove(ConfigVnfs vnf) {
-            // vnfsToRemove.add(vnf);
-            configVnfsRepository.delete(vnf);
-        }
-
-        public void remove(ConfigVfModules vfModule) {
-            // vfModulesToRemove.add(vfModule);
-            configVfModulesRepository.delete(vfModule);
-        }
-
-
-        public void commit() {
- 
-            long numServicesBefore = configServicesRepository.count();
-            long numNetworksBefore = configNetworksRepository.count();
-            long numVnfsBefore = configVnfsRepository.count();
-            long numVfModulesBefore = configVfModulesRepository.count();
-
-            // Commit is a no-op for now
-            return;
-            /*
-            for (ConfigServices service : servicesToSave) {
-                configServicesRepository.save(service);
-            }
-            for (ConfigNetworks network : networksToSave) {
-                configNetworksRepository.save(network);
-            }
-            for (ConfigVnfs vnf: vnfsToSave) {
-                configVnfsRepository.save(vnf);
-            }
-            for (ConfigVfModules vfModule : vfModulesToSave) {
-                configVfModulesRepository.save(vfModule);
-            }
-            for (ConfigServices service : servicesToRemove) {
-                configServicesRepository.delete(service);
-            }
-            for (ConfigNetworks network : networksToSave) {
-                configNetworksRepository.delete(network);
-            }
-            for (ConfigVnfs vnf: vnfsToSave) {
-                configVnfsRepository.delete(vnf);
-            }
-            for (ConfigVfModules vfModule : vfModulesToSave) {
-                configVfModulesRepository.delete(vfModule);
-            }
-            long numServicesAfter = configServicesRepository.count();
-            long numNetworksAfter = configNetworksRepository.count();
-            long numVnfsAfter = configVnfsRepository.count();
-            long numVfModulesAfter = configVfModulesRepository.count();
-
-            System.out.print("Done");
-            */
-        }
-    }
-
-    public ServiceDataTransaction createTransaction() {
-        return new ServiceDataTransaction();
-    }
-
-    public GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModule getVfModule(String svcInstanceId,
-            String vnfId, String vfModuleId) throws JsonProcessingException {
-        GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModule vfModule = null;
-        List<ConfigVfModules> configVfModules = configVfModulesRepository
-                .findBySvcInstanceIdAndVnfIdAndVfModuleId(svcInstanceId, vnfId, vfModuleId);
-        if ((configVfModules != null) && !configVfModules.isEmpty()) {
-            ConfigVfModules configVfModule = configVfModules.get(0);
-             vfModule = new GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModule();
-            vfModule.setVfModuleId(configVfModule.getVfModuleId());
-            String vfModuleDataAsString = configVfModule.getVfModuleData();
-            if (vfModuleDataAsString != null) {
-                vfModule.setVfModuleData(objectMapper.readValue(vfModuleDataAsString,
-                        GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfmoduleVfModuleData.class));
-            }
-
-        }
-        return (vfModule);
-    }
-
-    public GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfModules getVfModules(String svcInstanceId, String vnfId) throws JsonProcessingException {
-        GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfModules vfModules = null;
-        List<ConfigVfModules> configVfModules = configVfModulesRepository.findBySvcInstanceIdAndVnfId(svcInstanceId, vnfId);
-        if ((configVfModules != null) && !configVfModules.isEmpty()) {
-            vfModules = new GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfModules();
-            for (ConfigVfModules configVfModule : configVfModules) {
-                GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModule vfModule = new GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModule();
-                vfModule.setVfModuleId(configVfModule.getVfModuleId());
-                String vfModuleDataAsString = configVfModule.getVfModuleData();
-                if (vfModuleDataAsString != null) {
-                    vfModule.setVfModuleData(objectMapper.readValue(vfModuleDataAsString, GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfmoduleVfModuleData.class));
-                }
-                vfModules.addVfModuleItem(vfModule);
-            }
-        }
-        return(vfModules);
-    }
-
-    public GenericResourceApiServicedataServicedataVnfsVnf getVnf(String svcInstanceId, String vnfId) throws JsonProcessingException {
-        GenericResourceApiServicedataServicedataVnfsVnf vnf = null;
-        List<ConfigVnfs> configVnfs = configVnfsRepository.findBySvcInstanceIdAndVnfId(svcInstanceId, vnfId);
-        if ((configVnfs != null) && !configVnfs.isEmpty()) {
-            ConfigVnfs configVnf = configVnfs.get(0);
-            vnf = new GenericResourceApiServicedataServicedataVnfsVnf();
-            vnf.setVnfId(configVnf.getVnfId());
-            GenericResourceApiServicedataServicedataVnfsVnfVnfData vnfDataAsObject = null;
-            String vnfDataAsString = configVnf.getVnfData();
-            if (vnfDataAsString != null) {
-                vnfDataAsObject = objectMapper.readValue(vnfDataAsString, GenericResourceApiServicedataServicedataVnfsVnfVnfData.class);
-            }
-
-            GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfModules vfModules = getVfModules(svcInstanceId, vnfId);
-            if (vfModules != null) {
-                if (vnfDataAsObject == null) {
-                    vnfDataAsObject = new GenericResourceApiServicedataServicedataVnfsVnfVnfData();
-                }
-                vnfDataAsObject.setVfModules(vfModules);
-            }
-            vnf.setVnfData(vnfDataAsObject);
-        }
-        return(vnf);
-    }
-
-    public GenericResourceApiServicedataServicedataVnfs getVnfs(String svcInstanceId) throws JsonProcessingException {
-
-        GenericResourceApiServicedataServicedataVnfs vnfs = null;
-
-        List<ConfigVnfs> configVnfs = configVnfsRepository.findBySvcInstanceId(svcInstanceId);
-        if ((configVnfs != null) && !configVnfs.isEmpty()) {
-            vnfs = new GenericResourceApiServicedataServicedataVnfs();
-            for (ConfigVnfs configVnf : configVnfs) {
-                GenericResourceApiServicedataServicedataVnfsVnf vnf = new GenericResourceApiServicedataServicedataVnfsVnf();
-                vnf.setVnfId(configVnf.getVnfId());
-                GenericResourceApiServicedataServicedataVnfsVnfVnfData vnfDataAsObject = null;
-                String vnfDataAsString = configVnf.getVnfData();
-                if (vnfDataAsString != null) {
-                    vnfDataAsObject = objectMapper.readValue(vnfDataAsString,
-                            GenericResourceApiServicedataServicedataVnfsVnfVnfData.class);
-                }
-
-                GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfModules vfModules = getVfModules(svcInstanceId, configVnf.getVnfId());
-                if (vfModules != null) {
-                    if (vnfDataAsObject == null) {
-                        vnfDataAsObject = new GenericResourceApiServicedataServicedataVnfsVnfVnfData();
-                    }
-                    vnfDataAsObject.setVfModules(vfModules);
-                }
-                vnf.setVnfData(vnfDataAsObject);
-                vnfs.addVnfItem(vnf);
-            }
-        }
-        return (vnfs);
-    }
-
-    public GenericResourceApiServicedataServicedataNetworks getNetworks(String svcInstanceId) throws JsonProcessingException {
-        GenericResourceApiServicedataServicedataNetworks networks = null;
-        List<ConfigNetworks> configNetworks = configNetworksRepository.findBySvcInstanceId(svcInstanceId);
-        if ((configNetworks != null) && !configNetworks.isEmpty()) {
-            networks = new GenericResourceApiServicedataServicedataNetworks();
-
-            for (ConfigNetworks configNetwork : configNetworks) {
-                GenericResourceApiServicedataServicedataNetworksNetwork network = new GenericResourceApiServicedataServicedataNetworksNetwork();
-                network.setNetworkId(configNetwork.getNetworkId());
-                String networkDataAsString = configNetwork.getNetworkData();
-                if (networkDataAsString != null) {
-                    network.setNetworkData(objectMapper.readValue(networkDataAsString, GenericResourceApiServicedataServicedataNetworksNetworkNetworkData.class));
-                }
-                networks.addNetworkItem(network);
-            }
-        }
-
-        return(networks);
-    }
-
-    public String getServiceDataAsString(String svcInstanceId) throws JsonProcessingException {
-        GenericResourceApiServicedataServiceData svcData = getServiceData(svcInstanceId);
-        if (svcData == null) {
-            return(null);
-        } else {
-            return(objectMapper.writeValueAsString(getServiceData(svcInstanceId)));
-        }
-    }
-
-    public GenericResourceApiServicedataServiceData getServiceData(String svcInstanceId) throws JsonProcessingException {
-
-        List<ConfigServices> configServices = configServicesRepository.findBySvcInstanceId(svcInstanceId);
-        if ((configServices != null) && !configServices.isEmpty()) {
-            return(getServiceData(configServices.get(0)));
-        } else {
-            return(null);
-        }
-    }
-
-    public GenericResourceApiServicedataServiceData getServiceData(ConfigServices configService) throws JsonProcessingException {
-        if (configService == null) {
-            return(null);
-        }
-
-        GenericResourceApiServicedataServiceData svcData;
-        String svcInstanceId = configService.getSvcInstanceId();
-        String svcDataAsString = configService.getSvcData();
-
-        if ((svcDataAsString != null) && !svcDataAsString.isEmpty()) {
-            svcData = objectMapper.readValue(svcDataAsString, GenericResourceApiServicedataServiceData.class);
-        } else {
-            svcData = new GenericResourceApiServicedataServiceData();
-        }
-
-        // Add networks
-        GenericResourceApiServicedataServicedataNetworks networks = getNetworks(svcInstanceId);
-        if (networks != null) {
-            svcData.setNetworks(networks);
-        }
-
-        //Add Vnfs
-        GenericResourceApiServicedataServicedataVnfs vnfs = getVnfs(svcInstanceId);
-        if (vnfs != null) {
-            svcData.setVnfs(vnfs);
-        }
-
-        return(svcData);
-
-    }
-
-    public void saveVfModule(String svcInstanceId, String vnfId, GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModule vfModule, ServiceDataTransaction transaction) throws JsonProcessingException {
-        if (vfModule == null) {
-            return;
-        }
-        List<ConfigVfModules> configVfModules = configVfModulesRepository.findBySvcInstanceIdAndVnfIdAndVfModuleId(svcInstanceId, vnfId, vfModule.getVfModuleId());
-        ConfigVfModules configVfModule;
-        if ((configVfModules != null) && !configVfModules.isEmpty()) {
-            configVfModule = configVfModules.get(0);
-        } else {
-            configVfModule = new ConfigVfModules(svcInstanceId, vnfId, vfModule.getVfModuleId());
-        }
-        if (vfModule.getVfModuleData() != null) {
-            configVfModule.setVfModuleData(objectMapper.writeValueAsString(vfModule.getVfModuleData()));
-        }
-        if (transaction != null) {
-            transaction.save(configVfModule);
-        } else {
-            configVfModulesRepository.save(configVfModule);
-        }
-    }
-
-    public void saveVnf(String svcInstanceId, GenericResourceApiServicedataServicedataVnfsVnf vnf, ServiceDataTransaction transaction) throws JsonProcessingException {
-        if (vnf == null) {
-            return;
-        }
-
-        GenericResourceApiServicedataServicedataVnfsVnfVnfData vnfData = vnf.getVnfData();
-
-        // Make a list of potential vf modules to remove
-        HashMap<String, ConfigVfModules> vfModuleMap = new HashMap<>();
-        List<ConfigVfModules> configVfModuleList = configVfModulesRepository.findBySvcInstanceIdAndVnfId(svcInstanceId, vnf.getVnfId());
-        if ((configVfModuleList != null) && !configVfModuleList.isEmpty()) {
-            for (ConfigVfModules configVfModuleItem : configVfModuleList) {
-                vfModuleMap.put(configVfModuleItem.getVfModuleId(), configVfModuleItem);
-            }
-        }
-
-
-        // Save vf modules
-        GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfModules vfModules = vnfData.getVfModules();
-        if (vfModules != null) {
-            List<GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModule> vfModuleList = vfModules.getVfModule();
-            if ((vfModuleList != null) && !vfModuleList.isEmpty()) {
-                for (GenericResourceApiServicedataServicedataVnfsVnfVnfdataVfmodulesVfModule vfModule : vfModuleList) {
-                    saveVfModule(svcInstanceId, vnf.getVnfId(), vfModule, transaction);
-                    if (vfModuleMap.containsKey(vfModule.getVfModuleId())) {
-                        vfModuleMap.remove(vfModule.getVfModuleId());
-                    }
-                }
-            }
-
-            // Clear vf modules from vnfData before saving to avoid duplication
-            vnfData.setVfModules(null);
-        }
-        // Remove any vf Modules for this vnf id not in this list
-        for (ConfigVfModules vfModuleToRemove : vfModuleMap.values()) {
-            if (transaction != null) {
-                transaction.remove(vfModuleToRemove);
-            } else {
-                configVfModulesRepository.delete(vfModuleToRemove);
-            }
-        }
-
-        // Save Vnf itself
-        List<ConfigVnfs> configVnfs = configVnfsRepository.findBySvcInstanceIdAndVnfId(svcInstanceId, vnf.getVnfId());
-        ConfigVnfs configVnf;
-        if ((configVnfs != null) && !configVnfs.isEmpty()) {
-            configVnf = configVnfs.get(0);
-        } else {
-            configVnf = new ConfigVnfs(svcInstanceId, vnf.getVnfId());
-        }
-        configVnf.setVnfData(objectMapper.writeValueAsString(vnfData));
-
-        if (transaction != null) {
-            transaction.save(configVnf);
-        } else {
-            configVnfsRepository.save(configVnf);
-        }
-
-    }
-
-    public void saveNetwork(String svcInstanceId, GenericResourceApiServicedataServicedataNetworksNetwork network, ServiceDataTransaction transaction) throws JsonProcessingException {
-        List<ConfigNetworks> configNetworks = configNetworksRepository.findBySvcInstanceIdAndNetworkId(svcInstanceId, network.getNetworkId());
-        ConfigNetworks configNetwork;
-
-        if ((configNetworks != null) && !configNetworks.isEmpty()) {
-            configNetwork = configNetworks.get(0);
-        } else {
-            configNetwork = new ConfigNetworks(svcInstanceId, network.getNetworkId());
-        }
-        configNetwork.setNetworkData(objectMapper.writeValueAsString(network.getNetworkData()));
-        if (transaction != null) {
-            transaction.save(configNetwork);
-        } else {
-            configNetworksRepository.save(configNetwork);
-        }
-    }
-
-    public void saveService(ConfigServices configService, String svcDataAsString) throws JsonMappingException, JsonProcessingException {
-        saveService(configService, svcDataAsString, null);
-    }
-
-
-    public void saveService(ConfigServices configService, String svcDataAsString, ServiceDataTransaction transaction) throws JsonMappingException, JsonProcessingException {
-        if ((svcDataAsString == null) || (svcDataAsString.length() == 0)) {
-            configService.setSvcData(null);
-            configServicesRepository.save(configService);
-        } else {
-            saveService(configService, objectMapper.readValue(svcDataAsString, GenericResourceApiServicedataServiceData.class), transaction);
-        }
-    }
-
-    public void saveService(ConfigServices configService, GenericResourceApiServicedataServiceData svcData) throws JsonProcessingException {
-        saveService(configService, svcData, null);
-    }
-
-    public void saveService(ConfigServices configService, GenericResourceApiServicedataServiceData svcData, ServiceDataTransaction transaction) throws JsonProcessingException {
-        
-        if (svcData == null) {
-            configService.setSvcData(null);
-        } else {
-            String svcInstanceId = configService.getSvcInstanceId();
-
-            // Make a list of current networks for this service
-            HashMap<String, ConfigNetworks> networkMap = new HashMap<>();
-            List<ConfigNetworks> configNetworkList = configNetworksRepository.findBySvcInstanceId(svcInstanceId);
-            if ((configNetworkList != null) && !configNetworkList.isEmpty()) {
-                for (ConfigNetworks configNetworkItem : configNetworkList) {
-                    networkMap.put(configNetworkItem.getNetworkId(), configNetworkItem);
-                }
-            }
-            // Save networks
-            GenericResourceApiServicedataServicedataNetworks networks = svcData.getNetworks();
-            if (networks != null) {
-                List<GenericResourceApiServicedataServicedataNetworksNetwork> networkList = networks.getNetwork();
-                if ((networkList != null) && !networkList.isEmpty()) {
-                    for (GenericResourceApiServicedataServicedataNetworksNetwork networkItem : networkList) {
-                        if (networkMap.containsKey(networkItem.getNetworkId())) {
-                            networkMap.remove(networkItem.getNetworkId());
-                        }
-                        saveNetwork(svcInstanceId, networkItem, transaction);
-                    }
-                }
-            }
-
-            // Remove networks removed from service object
-            for (ConfigNetworks networkToRemove : networkMap.values()) {
-                if (transaction != null) {
-                    transaction.remove(networkToRemove);
-                } else {
-                    configNetworksRepository.delete(networkToRemove);
-                }
-            }
-
-            svcData.setNetworks(null);
-            
-            // Remove any networks no longer associated with this svcInstanceId
-            HashMap<String, ConfigVnfs> vnfMap = new HashMap<>();
-            List<ConfigVnfs> configVnfList = configVnfsRepository.findBySvcInstanceId(svcInstanceId);
-            if ((configVnfList != null) && !configVnfList.isEmpty()) {
-                for (ConfigVnfs configVnfItem : configVnfList) {
-                    vnfMap.put(configVnfItem.getVnfId(), configVnfItem);
-                }
-            }            
-
-            // Save vnfs / vfModules
-
-            // Save current vnfs associated with this service
-            GenericResourceApiServicedataServicedataVnfs vnfs = svcData.getVnfs();
-            if (vnfs != null) {
-                List<GenericResourceApiServicedataServicedataVnfsVnf> vnfList = vnfs.getVnf();
-                if ((vnfList != null) && !vnfList.isEmpty()) {
-                    for (GenericResourceApiServicedataServicedataVnfsVnf vnfItem : vnfList) {
-                        if (vnfMap.containsKey(vnfItem.getVnfId())) {
-                            vnfMap.remove(vnfItem.getVnfId());
-                        }
-                        saveVnf(svcInstanceId, vnfItem, transaction);
-                    }
-                }
-            }
-            for (ConfigVnfs vnfToRemove : vnfMap.values()) {
-                if (transaction != null) {
-                    transaction.remove(vnfToRemove);
-                } else {
-                    configVnfsRepository.delete(vnfToRemove);
-                }
-            }
-            svcData.setVnfs(null);
-
-            configService.setSvcData(objectMapper.writeValueAsString(svcData));
-        }
-        if (transaction != null) {
-            transaction.save(configService);
-        } else {
-            configServicesRepository.save(configService);
-        }
-    }
-
-    public long deleteVfModule(String svcInstanceId, String vnfId, String vfModuleId) {
-        return(configVfModulesRepository.deleteBySvcInstanceIdAndVnfIdAndVfModuleId(svcInstanceId, vnfId, vfModuleId));
-    }
-
-    public long deleteVnf(String svcInstanceId, String vnfId) {
-        configVfModulesRepository.deleteBySvcInstanceIdAndVnfId(svcInstanceId, vnfId);
-        return(configVnfsRepository.deleteBySvcInstanceIdAndVnfId(svcInstanceId, vnfId));
-    }
-
-    public long deleteNetwork(String svcInstanceId, String networkId) {
-        return(configNetworksRepository.deleteBySvcInstanceIdAndNetworkId(svcInstanceId, networkId));
-    }
-
-    public long deleteService(String svcInstanceId) {
-        configVfModulesRepository.deleteBySvcInstanceId(svcInstanceId);
-        configVnfsRepository.deleteBySvcInstanceId(svcInstanceId);
-        configNetworksRepository.deleteBySvcInstanceId(svcInstanceId);
-        return(configServicesRepository.deleteBySvcInstanceId(svcInstanceId));
-    }
-
-    public boolean hasServiceData(ConfigServices service) {
-        if ((service.getSvcData() != null) && (service.getSvcData().length() > 0)) {
-            return(true);
-        }
-
-        List<ConfigNetworks> networks = configNetworksRepository.findBySvcInstanceId(service.getSvcInstanceId());
-        if ((networks != null) && !networks.isEmpty()) {
-            return(true);
-        }
-
-        List<ConfigVnfs> vnfs = configVnfsRepository.findBySvcInstanceId(service.getSvcInstanceId());
-        if ((vnfs != null) && !vnfs.isEmpty()) {
-            return(true);
-        }
-
-        return(false);
-
-    }
-    public void clearServiceData(ConfigServices service) {
-        configVfModulesRepository.deleteBySvcInstanceId(service.getSvcInstanceId());
-        configVnfsRepository.deleteBySvcInstanceId(service.getSvcInstanceId());
-        configNetworksRepository.deleteBySvcInstanceId(service.getSvcInstanceId());
-        service.setSvcData(null);
-        configServicesRepository.save(service);
-    }
-
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResources.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResources.java
deleted file mode 100755
index 8fcf6d2..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResources.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.hibernate.validator.constraints.Length;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiRequestStatusEnumeration;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiAllottedresourcestatusAllottedResourceStatus;
-
-import javax.persistence.*;
-
-@Entity(name="CONFIG_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES")
-@Table(name="CONFIG_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES")
-public class ConfigContrailRouteAllottedResources {
-    @Id
-    @Length(max = 255)
-    @Column(length = 255)
-    String allottedResourceId;
-
-    @Lob
-    String arData;
-
-    // allottedResource status fields
-    String allottedResourceStatusResponseCode;
-
-    String allottedResourceStatusResponseMessage;
-
-    String allottedResourceStatusFinalIndicator;
-
-    String allottedResourceStatusRequestStatus;
-
-    String allottedResourceStatusAction;
-
-    String allottedResourceStatusRpcName;
-
-    String allottedResourceStatusRpcAction;
-
-    String allottedResourceStatusResponseTimestamp;
-
-
-    public ConfigContrailRouteAllottedResources() {
-        this.allottedResourceId = "";
-        this.arData = "";
-    }
-
-    public ConfigContrailRouteAllottedResources(String allottedResourceId, String arData) {
-        this.allottedResourceId = allottedResourceId;
-        this.arData = arData;
-    }
-
-    public ConfigContrailRouteAllottedResources(String allottedResourceId, String arData, GenericResourceApiAllottedresourcestatusAllottedResourceStatus allottedResourceStatus) {
-        this.allottedResourceId = allottedResourceId;
-        this.arData = arData;
-
-        if (allottedResourceStatus != null) {
-            this.allottedResourceStatusAction = allottedResourceStatus.getAction();
-            this.allottedResourceStatusFinalIndicator = allottedResourceStatus.getFinalIndicator();
-            this.allottedResourceStatusRequestStatus = allottedResourceStatus.getRequestStatus().toString();
-            this.allottedResourceStatusResponseCode = allottedResourceStatus.getResponseCode();
-            this.allottedResourceStatusResponseMessage = allottedResourceStatus.getResponseMessage();
-            this.allottedResourceStatusResponseTimestamp = allottedResourceStatus.getResponseTimestamp();
-        }
-    }
-
-    public String getAllottedResourceId() {
-        return allottedResourceId;
-    }
-
-    public void setAllottedResourceId(String allottedResourceId) {
-        this.allottedResourceId = allottedResourceId;
-    }
-
-    public String getArData() {
-        return arData;
-    }
-
-    public void setArData(String arData) {
-        this.arData = arData;
-    }
-
-    public String getAllottedResourceStatusResponseCode() {
-        return allottedResourceStatusResponseCode;
-    }
-
-    public void setAllottedResourceStatusResponseCode(String allottedResourceStatusResponseCode) {
-        this.allottedResourceStatusResponseCode = allottedResourceStatusResponseCode;
-    }
-
-    public String getAllottedResourceStatusResponseMessage() {
-        return allottedResourceStatusResponseMessage;
-    }
-
-    public void setAllottedResourceStatusResponseMessage(String allottedResourcesStatusResponseMessage) {
-        this.allottedResourceStatusResponseMessage = allottedResourcesStatusResponseMessage;
-    }
-
-    public String getAllottedResourceStatusFinalIndicator() {
-        return allottedResourceStatusFinalIndicator;
-    }
-
-    public void setAllottedResourceStatusFinalIndicator(String allottedResourceStatusFinalIndicator) {
-        this.allottedResourceStatusFinalIndicator = allottedResourceStatusFinalIndicator;
-    }
-
-    public String getAllottedResourceStatusRequestStatus() {
-        return allottedResourceStatusRequestStatus;
-    }
-
-    public void setAllottedResourceStatusRequestStatus(String allottedResourceStatusRequestStatus) {
-        this.allottedResourceStatusRequestStatus = allottedResourceStatusRequestStatus;
-    }
-
-    public String getAllottedResourceStatusAction() {
-        return allottedResourceStatusAction;
-    }
-
-    public void setAllottedResourceStatusAction(String allottedResourceStatusAction) {
-        this.allottedResourceStatusAction = allottedResourceStatusAction;
-    }
-
-    public String getAllottedResourceStatusRpcName() {
-        return allottedResourceStatusRpcName;
-    }
-
-    public void setAllottedResourceStatusRpcName(String allottedResourceStatusRpcName) {
-        this.allottedResourceStatusRpcName = allottedResourceStatusRpcName;
-    }
-
-    public String getAllottedResourceStatusRpcAction() {
-        return allottedResourceStatusRpcAction;
-    }
-
-    public void setAllottedResourceStatusRpcAction(String allottedResourceStatusRpcAction) {
-        this.allottedResourceStatusRpcAction = allottedResourceStatusRpcAction;
-    }
-
-    public String getAllottedResourceStatusResponseTimestamp() {
-        return allottedResourceStatusResponseTimestamp;
-    }
-
-    public void setAllottedResourceStatusResponseTimestamp(String allottedResourceStatusResponseTimestamp) {
-        this.allottedResourceStatusResponseTimestamp = allottedResourceStatusResponseTimestamp;
-    }
-
-    public GenericResourceApiAllottedresourcestatusAllottedResourceStatus getAllottedResourceStatus() {
-
-        if ((allottedResourceStatusAction == null) &&
-                (allottedResourceStatusFinalIndicator == null) &&
-                (allottedResourceStatusRequestStatus == null) &&
-                (allottedResourceStatusResponseCode == null) &&
-                (allottedResourceStatusResponseMessage == null) &&
-                (allottedResourceStatusResponseTimestamp == null)) {
-            return null;
-        }
-
-        GenericResourceApiAllottedresourcestatusAllottedResourceStatus allottedResourceStatus = new GenericResourceApiAllottedresourcestatusAllottedResourceStatus();
-        allottedResourceStatus.setAction(allottedResourceStatusAction);
-        allottedResourceStatus.setFinalIndicator(allottedResourceStatusFinalIndicator);
-        allottedResourceStatus.setRequestStatus(GenericResourceApiRequestStatusEnumeration.fromValue(allottedResourceStatusRequestStatus));
-        allottedResourceStatus.setResponseCode(allottedResourceStatusResponseCode);
-        allottedResourceStatus.setResponseMessage(allottedResourceStatusResponseMessage);
-        allottedResourceStatus.setResponseTimestamp(allottedResourceStatusResponseTimestamp);
-
-        return(allottedResourceStatus);
-    }
-
-    public void setAllottedResourceStatus(GenericResourceApiAllottedresourcestatusAllottedResourceStatus allottedResourceStatus) {
-        if (allottedResourceStatus == null) {
-            this.allottedResourceStatusAction = null;
-            this.allottedResourceStatusFinalIndicator = null;
-            this.allottedResourceStatusRequestStatus = null;
-            this.allottedResourceStatusResponseCode = null;
-            this.allottedResourceStatusResponseMessage = null;
-            this.allottedResourceStatusResponseTimestamp = null;
-        } else {
-            this.allottedResourceStatusAction = allottedResourceStatus.getAction();
-            this.allottedResourceStatusFinalIndicator = allottedResourceStatus.getFinalIndicator();
-            this.allottedResourceStatusRequestStatus = allottedResourceStatus.getRequestStatus().toString();
-            this.allottedResourceStatusResponseCode = allottedResourceStatus.getResponseCode();
-            this.allottedResourceStatusResponseMessage = allottedResourceStatus.getResponseMessage();
-            this.allottedResourceStatusResponseTimestamp = allottedResourceStatus.getResponseTimestamp();
-        }
-    }
-}
-\ No newline at end of file
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResourcesRepository.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResourcesRepository.java
deleted file mode 100755
index 9c3aa91..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResourcesRepository.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-
-@Transactional
-public interface ConfigContrailRouteAllottedResourcesRepository extends CrudRepository<ConfigContrailRouteAllottedResources, Long> {
-
-    List<ConfigContrailRouteAllottedResources> findByAllottedResourceId(String allottedResourceId);
-    long deleteByAllottedResourceId(String allottedResourceId);
-
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworks.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworks.java
deleted file mode 100644
index 1720ac8..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworks.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.hibernate.validator.constraints.Length;
-
-import javax.persistence.*;
-
-@Entity(name="CONFIG_GRA_NETWORKS")
-@Table(name="CONFIG_GRA_NETWORKS")
-@IdClass(NetworksKey.class)
-public class ConfigNetworks {
-    @Id
-    @Length(max = 100)
-    @Column(length = 100)
-    String svcInstanceId;
-
-    @Id
-    @Length(max = 100)
-    @Column(length = 100)
-    String networkId;
-
-    @Lob
-    String networkData;
-
-
-    public ConfigNetworks() {
-        this.svcInstanceId = "";
-        this.networkId = "";
-        this.networkData = "";
-    }
-
-    public ConfigNetworks(String svcInstanceId, String networkId) {
-        this.svcInstanceId = svcInstanceId;
-        this.networkId = networkId;
-        this.networkData = "";
-    }
-
-    public ConfigNetworks(String svcInstanceId, String networkId, String networkData) {
-        this.svcInstanceId = svcInstanceId;
-        this.networkId = networkId;
-        this.networkData = networkData;
-    }
-
-
-
-    public String getSvcInstanceId() {
-        return svcInstanceId;
-    }
-
-    public void setSvcInstanceId(String svcInstanceId) {
-        this.svcInstanceId = svcInstanceId;
-    }
-
-    public String getNetworkId() {
-        return networkId;
-    }
-
-    public void setNetworkId(String networkId) {
-        this.networkId = networkId;
-    }
-
-    public String getNetworkData() {
-        return networkData;
-    }
-
-    public void setNetworkData(String networkData) {
-        this.networkData = networkData;
-    }
-
-
-}
-\ No newline at end of file
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworksRepository.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworksRepository.java
deleted file mode 100644
index 56fc56c..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworksRepository.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-
-@Transactional
-public interface ConfigNetworksRepository extends CrudRepository<ConfigNetworks, Long> {
-
-    List<ConfigNetworks> findBySvcInstanceId(String svcInstanceId);
-    List<ConfigNetworks> findBySvcInstanceIdAndNetworkId(String svcInstanceId, String networkId);
-    long deleteBySvcInstanceId(String svcInstanceId);
-    long deleteBySvcInstanceIdAndNetworkId(String svcInstanceId, String networkId);
-
-}
-
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurations.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurations.java
deleted file mode 100755
index cdc5462..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurations.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.hibernate.validator.constraints.Length;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiConfigurationstatusConfigurationStatus;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiRequestStatusEnumeration;
-
-import javax.persistence.*;
-
-@Entity(name="CONFIG_GRA_PORT_MIRROR_CONFIGURATIONS")
-@Table(name="CONFIG_GRA_PORT_MIRROR_CONFIGURATIONS")
-public class ConfigPortMirrorConfigurations {
-    @Id
-    @Length(max = 255)
-    @Column(length = 255)
-    String configurationId;
-
-    @Lob
-    String pmcData;
-
-    // portMirrorConfiguration status fields
-    String portMirrorConfigurationStatusResponseCode;
-
-    String portMirrorConfigurationStatusResponseMessage;
-
-    String portMirrorConfigurationStatusFinalIndicator;
-
-    String portMirrorConfigurationStatusRequestStatus;
-
-    String portMirrorConfigurationStatusAction;
-
-    String portMirrorConfigurationStatusRpcName;
-
-    String portMirrorConfigurationStatusRpcAction;
-
-    String portMirrorConfigurationStatusResponseTimestamp;
-
-
-    public ConfigPortMirrorConfigurations() {
-        this.configurationId = "";
-        this.pmcData = "";
-    }
-
-    public ConfigPortMirrorConfigurations(String configurationId, String pmcData) {
-        this.configurationId = configurationId;
-        this.pmcData = pmcData;
-    }
-
-    public ConfigPortMirrorConfigurations(String configurationId, String pmcData, GenericResourceApiConfigurationstatusConfigurationStatus portMirrorConfigurationStatus) {
-        this.configurationId = configurationId;
-        this.pmcData = pmcData;
-
-        if (portMirrorConfigurationStatus != null) {
-            this.portMirrorConfigurationStatusAction = portMirrorConfigurationStatus.getAction();
-            this.portMirrorConfigurationStatusFinalIndicator = portMirrorConfigurationStatus.getFinalIndicator();
-            this.portMirrorConfigurationStatusRequestStatus = portMirrorConfigurationStatus.getRequestStatus().toString();
-            this.portMirrorConfigurationStatusResponseCode = portMirrorConfigurationStatus.getResponseCode();
-            this.portMirrorConfigurationStatusResponseMessage = portMirrorConfigurationStatus.getResponseMessage();
-            this.portMirrorConfigurationStatusResponseTimestamp = portMirrorConfigurationStatus.getResponseTimestamp();
-        }
-    }
-
-    public String getConfigureationId() {
-        return configurationId;
-    }
-
-    public void setConfigureationId(String configureationId) {
-        this.configurationId = configureationId;
-    }
-
-    public String getPmcData() {
-        return pmcData;
-    }
-
-    public void setPmcData(String pmcData) {
-        this.pmcData = pmcData;
-    }
-
-    public String getPortMirrorConfigurationStatusResponseCode() {
-        return portMirrorConfigurationStatusResponseCode;
-    }
-
-    public void setPortMirrorConfigurationStatusResponseCode(String portMirrorConfigurationStatusResponseCode) {
-        this.portMirrorConfigurationStatusResponseCode = portMirrorConfigurationStatusResponseCode;
-    }
-
-    public String getPortMirrorConfigurationStatusResponseMessage() {
-        return portMirrorConfigurationStatusResponseMessage;
-    }
-
-    public void setPortMirrorConfigurationStatusResponseMessage(String portMirrorConfigurationsStatusResponseMessage) {
-        this.portMirrorConfigurationStatusResponseMessage = portMirrorConfigurationsStatusResponseMessage;
-    }
-
-    public String getPortMirrorConfigurationStatusFinalIndicator() {
-        return portMirrorConfigurationStatusFinalIndicator;
-    }
-
-    public void setPortMirrorConfigurationStatusFinalIndicator(String portMirrorConfigurationStatusFinalIndicator) {
-        this.portMirrorConfigurationStatusFinalIndicator = portMirrorConfigurationStatusFinalIndicator;
-    }
-
-    public String getPortMirrorConfigurationStatusRequestStatus() {
-        return portMirrorConfigurationStatusRequestStatus;
-    }
-
-    public void setPortMirrorConfigurationStatusRequestStatus(String portMirrorConfigurationStatusRequestStatus) {
-        this.portMirrorConfigurationStatusRequestStatus = portMirrorConfigurationStatusRequestStatus;
-    }
-
-    public String getPortMirrorConfigurationStatusAction() {
-        return portMirrorConfigurationStatusAction;
-    }
-
-    public void setPortMirrorConfigurationStatusAction(String portMirrorConfigurationStatusAction) {
-        this.portMirrorConfigurationStatusAction = portMirrorConfigurationStatusAction;
-    }
-
-    public String getPortMirrorConfigurationStatusRpcName() {
-        return portMirrorConfigurationStatusRpcName;
-    }
-
-    public void setPortMirrorConfigurationStatusRpcName(String portMirrorConfigurationStatusRpcName) {
-        this.portMirrorConfigurationStatusRpcName = portMirrorConfigurationStatusRpcName;
-    }
-
-    public String getPortMirrorConfigurationStatusRpcAction() {
-        return portMirrorConfigurationStatusRpcAction;
-    }
-
-    public void setPortMirrorConfigurationStatusRpcAction(String portMirrorConfigurationStatusRpcAction) {
-        this.portMirrorConfigurationStatusRpcAction = portMirrorConfigurationStatusRpcAction;
-    }
-
-    public String getPortMirrorConfigurationStatusResponseTimestamp() {
-        return portMirrorConfigurationStatusResponseTimestamp;
-    }
-
-    public void setPortMirrorConfigurationStatusResponseTimestamp(String portMirrorConfigurationStatusResponseTimestamp) {
-        this.portMirrorConfigurationStatusResponseTimestamp = portMirrorConfigurationStatusResponseTimestamp;
-    }
-
-    public GenericResourceApiConfigurationstatusConfigurationStatus getPortMirrorConfigurationStatus() {
-
-        if ((portMirrorConfigurationStatusAction == null) &&
-                (portMirrorConfigurationStatusFinalIndicator == null) &&
-                (portMirrorConfigurationStatusRequestStatus == null) &&
-                (portMirrorConfigurationStatusResponseCode == null) &&
-                (portMirrorConfigurationStatusResponseMessage == null) &&
-                (portMirrorConfigurationStatusResponseTimestamp == null)) {
-            return null;
-        }
-
-        GenericResourceApiConfigurationstatusConfigurationStatus portMirrorConfigurationStatus = new GenericResourceApiConfigurationstatusConfigurationStatus();
-        portMirrorConfigurationStatus.setAction(portMirrorConfigurationStatusAction);
-        portMirrorConfigurationStatus.setFinalIndicator(portMirrorConfigurationStatusFinalIndicator);
-        portMirrorConfigurationStatus.setRequestStatus(GenericResourceApiRequestStatusEnumeration.fromValue(portMirrorConfigurationStatusRequestStatus));
-        portMirrorConfigurationStatus.setResponseCode(portMirrorConfigurationStatusResponseCode);
-        portMirrorConfigurationStatus.setResponseMessage(portMirrorConfigurationStatusResponseMessage);
-        portMirrorConfigurationStatus.setResponseTimestamp(portMirrorConfigurationStatusResponseTimestamp);
-
-        return(portMirrorConfigurationStatus);
-    }
-
-    public void setPortMirrorConfigurationStatus(GenericResourceApiConfigurationstatusConfigurationStatus portMirrorConfigurationStatus) {
-        if (portMirrorConfigurationStatus == null) {
-            this.portMirrorConfigurationStatusAction = null;
-            this.portMirrorConfigurationStatusFinalIndicator = null;
-            this.portMirrorConfigurationStatusRequestStatus = null;
-            this.portMirrorConfigurationStatusResponseCode = null;
-            this.portMirrorConfigurationStatusResponseMessage = null;
-            this.portMirrorConfigurationStatusResponseTimestamp = null;
-        } else {
-            this.portMirrorConfigurationStatusAction = portMirrorConfigurationStatus.getAction();
-            this.portMirrorConfigurationStatusFinalIndicator = portMirrorConfigurationStatus.getFinalIndicator();
-            this.portMirrorConfigurationStatusRequestStatus = portMirrorConfigurationStatus.getRequestStatus().toString();
-            this.portMirrorConfigurationStatusResponseCode = portMirrorConfigurationStatus.getResponseCode();
-            this.portMirrorConfigurationStatusResponseMessage = portMirrorConfigurationStatus.getResponseMessage();
-            this.portMirrorConfigurationStatusResponseTimestamp = portMirrorConfigurationStatus.getResponseTimestamp();
-        }
-    }
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurationsRepository.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurationsRepository.java
deleted file mode 100755
index 9ca148b..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurationsRepository.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-
-@Transactional
-public interface ConfigPortMirrorConfigurationsRepository extends CrudRepository<ConfigPortMirrorConfigurations, Long> {
-
-    List<ConfigPortMirrorConfigurations> findByConfigurationId(String configurationId);
-    long deleteByConfigurationId(String configurationId);
-
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadData.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadData.java
deleted file mode 100644
index a23884d..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadData.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.hibernate.validator.constraints.Length;
-
-import javax.persistence.*;
-
-@Entity(name = "CONFIG_PRELOAD_DATA")
-@Table(name="CONFIG_PRELOAD_DATA")
-@IdClass(PreloadDataKey.class)
-public class ConfigPreloadData {
-
-    @Id
-    @Length(max = 100)
-    @Column(length = 100)
-    private String preloadId;
-
-    @Id
-    @Length(max = 25)
-    @Column(length = 25)
-    private String preloadType;
-
-    @Lob
-    @Column(length=10000)
-    private String preloadData;
-
-    public ConfigPreloadData() {
-        this.preloadId = "";
-        this.preloadType = "";
-        this.preloadData = "";
-    }
-
-    public ConfigPreloadData(String preloadId, String preloadType, String preloadData) {
-        this.preloadId = preloadId;
-        this.preloadType = preloadType;
-        this.preloadData = preloadData;
-    }
-
-    public String getPreloadId() {
-        return preloadId;
-    }
-
-    public void setPreloadId(String preloadId) {
-        this.preloadId = preloadId;
-    }
-
-    public String getPreloadType() {
-        return preloadType;
-    }
-
-    public void setPreloadType(String preloadType) {
-        this.preloadType = preloadType;
-    }
-
-    public String getPreloadData() {
-        return preloadData;
-    }
-
-    public void setPreloadData(String preloadData) {
-        this.preloadData = preloadData;
-    }
-
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadDataRepository.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadDataRepository.java
deleted file mode 100644
index 0ec45b7..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadDataRepository.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-@Transactional
-public interface ConfigPreloadDataRepository extends CrudRepository<ConfigPreloadData, Long> {
-
-    List<ConfigPreloadData> findByPreloadIdAndPreloadType(String preloadId, String preloadType);
-    long deleteByPreloadIdAndPreloadType(String preloadId, String preloadType);
-
-}
-
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServices.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServices.java
deleted file mode 100644
index bf5d862..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServices.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.hibernate.validator.constraints.Length;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiRequestStatusEnumeration;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServiceStatus;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicestatusServiceStatus;
-
-import javax.persistence.*;
-
-@Entity(name="CONFIG_GRA_SERVICES")
-@Table(name="CONFIG_GRA_SERVICES")
-public class ConfigServices {
-    @Id
-    @Length(max = 100)
-    @Column(length = 100)
-    String svcInstanceId;
-
-    @Lob
-    String svcData;
-
-    // Service status fields
-    String serviceStatusResponseCode;
-
-    String serviceStatusResponseMessage;
-
-    String serviceStatusFinalIndicator;
-
-    String serviceStatusRequestStatus;
-
-    String serviceStatusAction;
-
-    String serviceStatusRpcName;
-
-    String serviceStatusRpcAction;
-
-    String serviceStatusResponseTimestamp;
-
-
-    public ConfigServices() {
-        this.svcInstanceId = "";
-        this.svcData = "";
-    }
-
-    public ConfigServices(String svcInstanceId) {
-        this.svcInstanceId = svcInstanceId;
-        this.svcData = "";
-    }
-
-    public ConfigServices(String svcInstanceId, String svcData) {
-        this.svcInstanceId = svcInstanceId;
-        this.svcData = svcData;
-    }
-
-    public ConfigServices(String svcInstanceId, GenericResourceApiServicestatusServiceStatus serviceStatus) {
-        this.svcInstanceId = svcInstanceId;
-        this.svcData = "";
-
-        if (serviceStatus != null) {
-            this.serviceStatusAction = serviceStatus.getAction();
-            this.serviceStatusFinalIndicator = serviceStatus.getFinalIndicator();
-            this.serviceStatusRequestStatus = serviceStatus.getRequestStatus().toString();
-            this.serviceStatusResponseCode = serviceStatus.getResponseCode();
-            this.serviceStatusResponseMessage = serviceStatus.getResponseMessage();
-            this.serviceStatusResponseTimestamp = serviceStatus.getResponseTimestamp();
-        }
-    }
-
-    public ConfigServices(String svcInstanceId, String svcData, GenericResourceApiServicestatusServiceStatus serviceStatus) {
-        this.svcInstanceId = svcInstanceId;
-        this.svcData = svcData;
-
-        if (serviceStatus != null) {
-            this.serviceStatusAction = serviceStatus.getAction();
-            this.serviceStatusFinalIndicator = serviceStatus.getFinalIndicator();
-            this.serviceStatusRequestStatus = serviceStatus.getRequestStatus().toString();
-            this.serviceStatusResponseCode = serviceStatus.getResponseCode();
-            this.serviceStatusResponseMessage = serviceStatus.getResponseMessage();
-            this.serviceStatusResponseTimestamp = serviceStatus.getResponseTimestamp();
-        }
-    }
-
-    public String getSvcInstanceId() {
-        return svcInstanceId;
-    }
-
-    public void setSvcInstanceId(String svcInstanceId) {
-        this.svcInstanceId = svcInstanceId;
-    }
-
-    public String getSvcData() {
-        return svcData;
-    }
-
-    public void setSvcData(String svcData) {
-        this.svcData = svcData;
-    }
-
-    public String getServiceStatusResponseCode() {
-        return serviceStatusResponseCode;
-    }
-
-    public void setServiceStatusResponseCode(String serviceStatusResponseCode) {
-        this.serviceStatusResponseCode = serviceStatusResponseCode;
-    }
-
-    public String getServiceStatusResponseMessage() {
-        return serviceStatusResponseMessage;
-    }
-
-    public void setServiceStatusResponseMessage(String servicesStatusResponseMessage) {
-        this.serviceStatusResponseMessage = servicesStatusResponseMessage;
-    }
-
-    public String getServiceStatusFinalIndicator() {
-        return serviceStatusFinalIndicator;
-    }
-
-    public void setServiceStatusFinalIndicator(String serviceStatusFinalIndicator) {
-        this.serviceStatusFinalIndicator = serviceStatusFinalIndicator;
-    }
-
-    public String getServiceStatusRequestStatus() {
-        return serviceStatusRequestStatus;
-    }
-
-    public void setServiceStatusRequestStatus(String serviceStatusRequestStatus) {
-        this.serviceStatusRequestStatus = serviceStatusRequestStatus;
-    }
-
-    public String getServiceStatusAction() {
-        return serviceStatusAction;
-    }
-
-    public void setServiceStatusAction(String serviceStatusAction) {
-        this.serviceStatusAction = serviceStatusAction;
-    }
-
-    public String getServiceStatusRpcName() {
-        return serviceStatusRpcName;
-    }
-
-    public void setServiceStatusRpcName(String serviceStatusRpcName) {
-        this.serviceStatusRpcName = serviceStatusRpcName;
-    }
-
-    public String getServiceStatusRpcAction() {
-        return serviceStatusRpcAction;
-    }
-
-    public void setServiceStatusRpcAction(String serviceStatusRpcAction) {
-        this.serviceStatusRpcAction = serviceStatusRpcAction;
-    }
-
-    public String getServiceStatusResponseTimestamp() {
-        return serviceStatusResponseTimestamp;
-    }
-
-    public void setServiceStatusResponseTimestamp(String serviceStatusResponseTimestamp) {
-        this.serviceStatusResponseTimestamp = serviceStatusResponseTimestamp;
-    }
-
-    public GenericResourceApiServicestatusServiceStatus getServiceStatus() {
-
-        if ((serviceStatusAction == null) &&
-                (serviceStatusFinalIndicator == null) &&
-                (serviceStatusRequestStatus == null) &&
-                (serviceStatusResponseCode == null) &&
-                (serviceStatusResponseMessage == null) &&
-                (serviceStatusResponseTimestamp == null)) {
-            return null;
-        }
-
-        GenericResourceApiServicestatusServiceStatus serviceStatus = new GenericResourceApiServicestatusServiceStatus();
-        serviceStatus.setAction(serviceStatusAction);
-        serviceStatus.setFinalIndicator(serviceStatusFinalIndicator);
-        serviceStatus.setRequestStatus(GenericResourceApiRequestStatusEnumeration.fromValue(serviceStatusRequestStatus));
-        serviceStatus.setResponseCode(serviceStatusResponseCode);
-        serviceStatus.setResponseMessage(serviceStatusResponseMessage);
-        serviceStatus.setResponseTimestamp(serviceStatusResponseTimestamp);
-
-        return(serviceStatus);
-    }
-
-    public void setServiceStatus(GenericResourceApiServicestatusServiceStatus serviceStatus) {
-        if (serviceStatus == null) {
-            this.serviceStatusAction = null;
-            this.serviceStatusFinalIndicator = null;
-            this.serviceStatusRequestStatus = null;
-            this.serviceStatusResponseCode = null;
-            this.serviceStatusResponseMessage = null;
-            this.serviceStatusResponseTimestamp = null;
-        } else {
-            this.serviceStatusAction = serviceStatus.getAction();
-            this.serviceStatusFinalIndicator = serviceStatus.getFinalIndicator();
-            this.serviceStatusRequestStatus = serviceStatus.getRequestStatus().toString();
-            this.serviceStatusResponseCode = serviceStatus.getResponseCode();
-            this.serviceStatusResponseMessage = serviceStatus.getResponseMessage();
-            this.serviceStatusResponseTimestamp = serviceStatus.getResponseTimestamp();
-        }
-    }
-}
-\ No newline at end of file
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServicesRepository.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServicesRepository.java
deleted file mode 100644
index 5b43947..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServicesRepository.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-
-@Transactional
-public interface ConfigServicesRepository extends CrudRepository<ConfigServices, Long> {
-
-    List<ConfigServices> findBySvcInstanceId(String svcInstanceId);
-    long deleteBySvcInstanceId(String svcInstanceId);
-
-}
-
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModules.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModules.java
deleted file mode 100644
index d4d5ea5..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModules.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.hibernate.validator.constraints.Length;
-
-import javax.persistence.*;
-
-@Entity(name="CONFIG_GRA_VF_MODULES")
-@Table(name="CONFIG_GRA_VF_MODULES")
-@IdClass(VfModulesKey.class)
-public class ConfigVfModules {
-    @Id
-    @Length(max = 100)
-    @Column(length = 100)
-    String svcInstanceId;
-
-    @Id
-    @Length(max = 100)
-    @Column(length = 100)
-    String vnfId;
-
-    @Id
-    @Length(max = 100)
-    @Column(length = 100)
-    String vfModuleId;
-
-    @Lob
-    String vfModuleData;
-
-
-    public ConfigVfModules() {
-        this.svcInstanceId = "";
-        this.vnfId = "";
-        this.vfModuleId = "";
-        this.vfModuleData = "";
-    }
-
-    public ConfigVfModules(String svcInstanceId, String vnfId, String vfModuleId) {
-        this.svcInstanceId = svcInstanceId;
-        this.vnfId = vnfId;
-        this.vfModuleId = vfModuleId;
-        this.vfModuleData = "";
-    }
-
-    public ConfigVfModules(String svcInstanceId, String vnfId, String vfModuleId, String vfModuleData) {
-        this.svcInstanceId = svcInstanceId;
-        this.vnfId = vnfId;
-        this.vfModuleId = vfModuleId;
-        this.vfModuleData = vfModuleData;
-    }
-
-    public String getSvcInstanceId() {
-        return svcInstanceId;
-    }
-
-    public void setSvcInstanceId(String svcInstanceId) {
-        this.svcInstanceId = svcInstanceId;
-    }
-
-    public String getVnfId() {
-        return vnfId;
-    }
-
-    public void setVnfId(String vnfId) {
-        this.vnfId = vnfId;
-    }
-
-    public String getVfModuleId() {
-        return vfModuleId;
-    }
-
-    public void setVfModuleId(String vfModuleId) {
-        this.vfModuleId = vfModuleId;
-    }
-
-    public String getVfModuleData() {
-        return vfModuleData;
-    }
-
-    public void setVfModuleData(String vfModuleData) {
-        this.vfModuleData = vfModuleData;
-    }
-
-  
-}
-\ No newline at end of file
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModulesRepository.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModulesRepository.java
deleted file mode 100644
index 8203483..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModulesRepository.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-
-@Transactional
-public interface ConfigVfModulesRepository extends CrudRepository<ConfigVfModules, Long> {
-
-    List<ConfigVfModules> findBySvcInstanceId(String svcInstanceId);
-    List<ConfigVfModules> findBySvcInstanceIdAndVnfId(String svcInstanceId, String vnfId);
-    List<ConfigVfModules> findBySvcInstanceIdAndVnfIdAndVfModuleId(String svcInstanceId, String vnfId, String vfModuleId);
-    long deleteBySvcInstanceId(String svcInstanceId);
-    long deleteBySvcInstanceIdAndVnfId(String svcInstanceId, String vnfId);
-    long deleteBySvcInstanceIdAndVnfIdAndVfModuleId(String svcInstanceId, String vnfId, String vfModuleId);
-
-}
-
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfs.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfs.java
deleted file mode 100644
index 44337fd..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfs.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.hibernate.validator.constraints.Length;
-
-import javax.persistence.*;
-
-@Entity(name="CONFIG_GRA_VNFS")
-@Table(name="CONFIG_GRA_VNFS")
-@IdClass(VnfsKey.class)
-public class ConfigVnfs {
-    @Id
-    @Length(max = 100)
-    @Column(length = 100)
-    String svcInstanceId;
-
-    @Id
-    @Length(max = 100)
-    @Column(length = 100)
-    String vnfId;
-
-    @Lob
-    String vnfData;
-
-
-    public ConfigVnfs() {
-        this.svcInstanceId = "";
-        this.vnfId = "";
-        this.vnfData = "";
-    }
-
-    public ConfigVnfs(String svcInstanceId, String vnfId) {
-        this.svcInstanceId = svcInstanceId;
-        this.vnfId = vnfId;
-        this.vnfData = "";
-    }
-
-    public ConfigVnfs(String svcInstanceId, String vnfId, String vnfData) {
-        this.svcInstanceId = svcInstanceId;
-        this.vnfId = vnfId;
-        this.vnfData = vnfData;
-    }
-
-    public String getSvcInstanceId() {
-        return svcInstanceId;
-    }
-
-    public void setSvcInstanceId(String svcInstanceId) {
-        this.svcInstanceId = svcInstanceId;
-    }
-
-    public String getVnfId() {
-        return vnfId;
-    }
-
-    public void setVnfId(String vnfId) {
-        this.vnfId = vnfId;
-    }
-
-    public String getVnfData() {
-        return vnfData;
-    }
-
-    public void setVnfData(String vnfData) {
-        this.vnfData = vnfData;
-    }
-}
-\ No newline at end of file
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfsRepository.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfsRepository.java
deleted file mode 100644
index 3909eb3..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfsRepository.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-
-@Transactional
-public interface ConfigVnfsRepository extends CrudRepository<ConfigVnfs, Long> {
-
-    List<ConfigVnfs> findBySvcInstanceId(String svcInstanceId);
-    List<ConfigVnfs> findBySvcInstanceIdAndVnfId(String svcInstanceId, String vnfId);
-    long deleteBySvcInstanceId(String svcInstanceId);
-    long deleteBySvcInstanceIdAndVnfId(String svcInstanceId, String vnfId);
-
-}
-
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/NetworksKey.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/NetworksKey.java
deleted file mode 100644
index 61f7602..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/NetworksKey.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.data;
-
-import java.io.Serializable;
-
-public class NetworksKey implements Serializable {
-    private String svcInstanceId = "";
-    private String networkId = "";
-
-    public NetworksKey() {
-        this.svcInstanceId = "";
-        this.networkId = "";
-    }
-
-    public NetworksKey(String svcInstanceId, String networkId) {
-        this.svcInstanceId = svcInstanceId;
-        this.networkId = networkId;
-    }
-
-    @Override
-    public int hashCode() {
-        return svcInstanceId.hashCode() + networkId.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return (obj instanceof NetworksKey &&
-                svcInstanceId.equals(((NetworksKey)obj).svcInstanceId) &&
-                networkId.equals(((NetworksKey)obj).networkId));
-    }
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResources.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResources.java
deleted file mode 100755
index 51ab88f..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResources.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.hibernate.validator.constraints.Length;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiAllottedresourcestatusAllottedResourceStatus;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiRequestStatusEnumeration;
-
-import javax.persistence.*;
-
-@Entity(name="OPERATIONAL_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES")
-@Table(name="OPERATIONAL_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES")
-public class OperationalContrailRouteAllottedResources {
-    @Id
-    @Length(max = 255)
-    @Column(length = 255)
-    String allottedResourceId;
-
-    @Lob
-    String arData;
-
-    // allottedResource status fields
-    String allottedResourceStatusResponseCode;
-
-    String allottedResourceStatusResponseMessage;
-
-    String allottedResourceStatusFinalIndicator;
-
-    String allottedResourceStatusRequestStatus;
-
-    String allottedResourceStatusAction;
-
-    String allottedResourceStatusRpcName;
-
-    String allottedResourceStatusRpcAction;
-
-    String allottedResourceStatusResponseTimestamp;
-
-
-    public OperationalContrailRouteAllottedResources() {
-        this.allottedResourceId = "";
-        this.arData = "";
-    }
-
-    public OperationalContrailRouteAllottedResources(String allottedResourceId, String arData) {
-        this.allottedResourceId = allottedResourceId;
-        this.arData = arData;
-    }
-
-    public OperationalContrailRouteAllottedResources(String allottedResourceId, String arData, GenericResourceApiAllottedresourcestatusAllottedResourceStatus allottedResourceStatus) {
-        this.allottedResourceId = allottedResourceId;
-        this.arData = arData;
-
-        if (allottedResourceStatus != null) {
-            this.allottedResourceStatusAction = allottedResourceStatus.getAction();
-            this.allottedResourceStatusFinalIndicator = allottedResourceStatus.getFinalIndicator();
-            this.allottedResourceStatusRequestStatus = allottedResourceStatus.getRequestStatus().toString();
-            this.allottedResourceStatusResponseCode = allottedResourceStatus.getResponseCode();
-            this.allottedResourceStatusResponseMessage = allottedResourceStatus.getResponseMessage();
-            this.allottedResourceStatusResponseTimestamp = allottedResourceStatus.getResponseTimestamp();
-        }
-    }
-
-    public String getAllottedResourceId() {
-        return allottedResourceId;
-    }
-
-    public void setAllottedResourceId(String allottedResourceId) {
-        this.allottedResourceId = allottedResourceId;
-    }
-
-    public String getArData() {
-        return arData;
-    }
-
-    public void setArData(String arData) {
-        this.arData = arData;
-    }
-
-    public String getAllottedResourceStatusResponseCode() {
-        return allottedResourceStatusResponseCode;
-    }
-
-    public void setAllottedResourceStatusResponseCode(String allottedResourceStatusResponseCode) {
-        this.allottedResourceStatusResponseCode = allottedResourceStatusResponseCode;
-    }
-
-    public String getAllottedResourceStatusResponseMessage() {
-        return allottedResourceStatusResponseMessage;
-    }
-
-    public void setAllottedResourceStatusResponseMessage(String allottedResourcesStatusResponseMessage) {
-        this.allottedResourceStatusResponseMessage = allottedResourcesStatusResponseMessage;
-    }
-
-    public String getAllottedResourceStatusFinalIndicator() {
-        return allottedResourceStatusFinalIndicator;
-    }
-
-    public void setAllottedResourceStatusFinalIndicator(String allottedResourceStatusFinalIndicator) {
-        this.allottedResourceStatusFinalIndicator = allottedResourceStatusFinalIndicator;
-    }
-
-    public String getAllottedResourceStatusRequestStatus() {
-        return allottedResourceStatusRequestStatus;
-    }
-
-    public void setAllottedResourceStatusRequestStatus(String allottedResourceStatusRequestStatus) {
-        this.allottedResourceStatusRequestStatus = allottedResourceStatusRequestStatus;
-    }
-
-    public String getAllottedResourceStatusAction() {
-        return allottedResourceStatusAction;
-    }
-
-    public void setAllottedResourceStatusAction(String allottedResourceStatusAction) {
-        this.allottedResourceStatusAction = allottedResourceStatusAction;
-    }
-
-    public String getAllottedResourceStatusRpcName() {
-        return allottedResourceStatusRpcName;
-    }
-
-    public void setAllottedResourceStatusRpcName(String allottedResourceStatusRpcName) {
-        this.allottedResourceStatusRpcName = allottedResourceStatusRpcName;
-    }
-
-    public String getAllottedResourceStatusRpcAction() {
-        return allottedResourceStatusRpcAction;
-    }
-
-    public void setAllottedResourceStatusRpcAction(String allottedResourceStatusRpcAction) {
-        this.allottedResourceStatusRpcAction = allottedResourceStatusRpcAction;
-    }
-
-    public String getAllottedResourceStatusResponseTimestamp() {
-        return allottedResourceStatusResponseTimestamp;
-    }
-
-    public void setAllottedResourceStatusResponseTimestamp(String allottedResourceStatusResponseTimestamp) {
-        this.allottedResourceStatusResponseTimestamp = allottedResourceStatusResponseTimestamp;
-    }
-
-    public GenericResourceApiAllottedresourcestatusAllottedResourceStatus getAllottedResourceStatus() {
-
-        if ((allottedResourceStatusAction == null) &&
-                (allottedResourceStatusFinalIndicator == null) &&
-                (allottedResourceStatusRequestStatus == null) &&
-                (allottedResourceStatusResponseCode == null) &&
-                (allottedResourceStatusResponseMessage == null) &&
-                (allottedResourceStatusResponseTimestamp == null)) {
-            return null;
-        }
-
-        GenericResourceApiAllottedresourcestatusAllottedResourceStatus allottedResourceStatus = new GenericResourceApiAllottedresourcestatusAllottedResourceStatus();
-        allottedResourceStatus.setAction(allottedResourceStatusAction);
-        allottedResourceStatus.setFinalIndicator(allottedResourceStatusFinalIndicator);
-        allottedResourceStatus.setRequestStatus(GenericResourceApiRequestStatusEnumeration.fromValue(allottedResourceStatusRequestStatus));
-        allottedResourceStatus.setResponseCode(allottedResourceStatusResponseCode);
-        allottedResourceStatus.setResponseMessage(allottedResourceStatusResponseMessage);
-        allottedResourceStatus.setResponseTimestamp(allottedResourceStatusResponseTimestamp);
-
-        return(allottedResourceStatus);
-    }
-
-    public void setAllottedResourceStatus(GenericResourceApiAllottedresourcestatusAllottedResourceStatus allottedResourceStatus) {
-        if (allottedResourceStatus == null) {
-            this.allottedResourceStatusAction = null;
-            this.allottedResourceStatusFinalIndicator = null;
-            this.allottedResourceStatusRequestStatus = null;
-            this.allottedResourceStatusResponseCode = null;
-            this.allottedResourceStatusResponseMessage = null;
-            this.allottedResourceStatusResponseTimestamp = null;
-        } else {
-            this.allottedResourceStatusAction = allottedResourceStatus.getAction();
-            this.allottedResourceStatusFinalIndicator = allottedResourceStatus.getFinalIndicator();
-            this.allottedResourceStatusRequestStatus = allottedResourceStatus.getRequestStatus().toString();
-            this.allottedResourceStatusResponseCode = allottedResourceStatus.getResponseCode();
-            this.allottedResourceStatusResponseMessage = allottedResourceStatus.getResponseMessage();
-            this.allottedResourceStatusResponseTimestamp = allottedResourceStatus.getResponseTimestamp();
-        }
-    }
-}
-\ No newline at end of file
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResourcesRepository.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResourcesRepository.java
deleted file mode 100755
index c737721..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResourcesRepository.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-
-@Transactional
-public interface OperationalContrailRouteAllottedResourcesRepository extends CrudRepository<OperationalContrailRouteAllottedResources, Long> {
-
-    List<OperationalContrailRouteAllottedResources> findByAllottedResourceId(String allottedResourceId);
-    long deleteByAllottedResourceId(String allottedResourceId);
-
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurations.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurations.java
deleted file mode 100755
index da9c0ce..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurations.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.hibernate.validator.constraints.Length;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiConfigurationstatusConfigurationStatus;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiRequestStatusEnumeration;
-
-import javax.persistence.*;
-
-@Entity(name="OPERATIONAL_GRA_PORT_MIRROR_CONFIGURATIONS")
-@Table(name="OPERATIONAL_GRA_PORT_MIRROR_CONFIGURATIONS")
-public class OperationalPortMirrorConfigurations {
-    @Id
-    @Length(max = 255)
-    @Column(length = 255)
-    String configurationId;
-
-    @Lob
-    String pmcData;
-
-    // portMirrorConfiguration status fields
-    String portMirrorConfigurationStatusResponseCode;
-
-    String portMirrorConfigurationStatusResponseMessage;
-
-    String portMirrorConfigurationStatusFinalIndicator;
-
-    String portMirrorConfigurationStatusRequestStatus;
-
-    String portMirrorConfigurationStatusAction;
-
-    String portMirrorConfigurationStatusRpcName;
-
-    String portMirrorConfigurationStatusRpcAction;
-
-    String portMirrorConfigurationStatusResponseTimestamp;
-
-
-    public OperationalPortMirrorConfigurations() {
-        this.configurationId = "";
-        this.pmcData = "";
-    }
-
-    public OperationalPortMirrorConfigurations(String configurationId, String pmcData) {
-        this.configurationId = configurationId;
-        this.pmcData = pmcData;
-    }
-
-    public OperationalPortMirrorConfigurations(String configurationId, String pmcData, GenericResourceApiConfigurationstatusConfigurationStatus portMirrorConfigurationStatus) {
-        this.configurationId = configurationId;
-        this.pmcData = pmcData;
-
-        if (portMirrorConfigurationStatus != null) {
-            this.portMirrorConfigurationStatusAction = portMirrorConfigurationStatus.getAction();
-            this.portMirrorConfigurationStatusFinalIndicator = portMirrorConfigurationStatus.getFinalIndicator();
-            this.portMirrorConfigurationStatusRequestStatus = portMirrorConfigurationStatus.getRequestStatus().toString();
-            this.portMirrorConfigurationStatusResponseCode = portMirrorConfigurationStatus.getResponseCode();
-            this.portMirrorConfigurationStatusResponseMessage = portMirrorConfigurationStatus.getResponseMessage();
-            this.portMirrorConfigurationStatusResponseTimestamp = portMirrorConfigurationStatus.getResponseTimestamp();
-        }
-    }
-
-    public String getConfigurationId() {
-        return configurationId;
-    }
-
-    public void setConfigurationId(String configurationId) {
-        this.configurationId = configurationId;
-    }
-
-    public String getPmcData() {
-        return pmcData;
-    }
-
-    public void setPmcData(String pmcData) {
-        this.pmcData = pmcData;
-    }
-
-    public String getPortMirrorConfigurationStatusResponseCode() {
-        return portMirrorConfigurationStatusResponseCode;
-    }
-
-    public void setPortMirrorConfigurationStatusResponseCode(String portMirrorConfigurationStatusResponseCode) {
-        this.portMirrorConfigurationStatusResponseCode = portMirrorConfigurationStatusResponseCode;
-    }
-
-    public String getPortMirrorConfigurationStatusResponseMessage() {
-        return portMirrorConfigurationStatusResponseMessage;
-    }
-
-    public void setPortMirrorConfigurationStatusResponseMessage(String portMirrorConfigurationsStatusResponseMessage) {
-        this.portMirrorConfigurationStatusResponseMessage = portMirrorConfigurationsStatusResponseMessage;
-    }
-
-    public String getPortMirrorConfigurationStatusFinalIndicator() {
-        return portMirrorConfigurationStatusFinalIndicator;
-    }
-
-    public void setPortMirrorConfigurationStatusFinalIndicator(String portMirrorConfigurationStatusFinalIndicator) {
-        this.portMirrorConfigurationStatusFinalIndicator = portMirrorConfigurationStatusFinalIndicator;
-    }
-
-    public String getPortMirrorConfigurationStatusRequestStatus() {
-        return portMirrorConfigurationStatusRequestStatus;
-    }
-
-    public void setPortMirrorConfigurationStatusRequestStatus(String portMirrorConfigurationStatusRequestStatus) {
-        this.portMirrorConfigurationStatusRequestStatus = portMirrorConfigurationStatusRequestStatus;
-    }
-
-    public String getPortMirrorConfigurationStatusAction() {
-        return portMirrorConfigurationStatusAction;
-    }
-
-    public void setPortMirrorConfigurationStatusAction(String portMirrorConfigurationStatusAction) {
-        this.portMirrorConfigurationStatusAction = portMirrorConfigurationStatusAction;
-    }
-
-    public String getPortMirrorConfigurationStatusRpcName() {
-        return portMirrorConfigurationStatusRpcName;
-    }
-
-    public void setPortMirrorConfigurationStatusRpcName(String portMirrorConfigurationStatusRpcName) {
-        this.portMirrorConfigurationStatusRpcName = portMirrorConfigurationStatusRpcName;
-    }
-
-    public String getPortMirrorConfigurationStatusRpcAction() {
-        return portMirrorConfigurationStatusRpcAction;
-    }
-
-    public void setPortMirrorConfigurationStatusRpcAction(String portMirrorConfigurationStatusRpcAction) {
-        this.portMirrorConfigurationStatusRpcAction = portMirrorConfigurationStatusRpcAction;
-    }
-
-    public String getPortMirrorConfigurationStatusResponseTimestamp() {
-        return portMirrorConfigurationStatusResponseTimestamp;
-    }
-
-    public void setPortMirrorConfigurationStatusResponseTimestamp(String portMirrorConfigurationStatusResponseTimestamp) {
-        this.portMirrorConfigurationStatusResponseTimestamp = portMirrorConfigurationStatusResponseTimestamp;
-    }
-
-    public GenericResourceApiConfigurationstatusConfigurationStatus getPortMirrorConfigurationStatus() {
-
-        if ((portMirrorConfigurationStatusAction == null) &&
-                (portMirrorConfigurationStatusFinalIndicator == null) &&
-                (portMirrorConfigurationStatusRequestStatus == null) &&
-                (portMirrorConfigurationStatusResponseCode == null) &&
-                (portMirrorConfigurationStatusResponseMessage == null) &&
-                (portMirrorConfigurationStatusResponseTimestamp == null)) {
-            return null;
-        }
-
-        GenericResourceApiConfigurationstatusConfigurationStatus portMirrorConfigurationStatus = new GenericResourceApiConfigurationstatusConfigurationStatus();
-        portMirrorConfigurationStatus.setAction(portMirrorConfigurationStatusAction);
-        portMirrorConfigurationStatus.setFinalIndicator(portMirrorConfigurationStatusFinalIndicator);
-        portMirrorConfigurationStatus.setRequestStatus(GenericResourceApiRequestStatusEnumeration.fromValue(portMirrorConfigurationStatusRequestStatus));
-        portMirrorConfigurationStatus.setResponseCode(portMirrorConfigurationStatusResponseCode);
-        portMirrorConfigurationStatus.setResponseMessage(portMirrorConfigurationStatusResponseMessage);
-        portMirrorConfigurationStatus.setResponseTimestamp(portMirrorConfigurationStatusResponseTimestamp);
-
-        return(portMirrorConfigurationStatus);
-    }
-
-    public void setPortMirrorConfigurationStatus(GenericResourceApiConfigurationstatusConfigurationStatus portMirrorConfigurationStatus) {
-        if (portMirrorConfigurationStatus == null) {
-            this.portMirrorConfigurationStatusAction = null;
-            this.portMirrorConfigurationStatusFinalIndicator = null;
-            this.portMirrorConfigurationStatusRequestStatus = null;
-            this.portMirrorConfigurationStatusResponseCode = null;
-            this.portMirrorConfigurationStatusResponseMessage = null;
-            this.portMirrorConfigurationStatusResponseTimestamp = null;
-        } else {
-            this.portMirrorConfigurationStatusAction = portMirrorConfigurationStatus.getAction();
-            this.portMirrorConfigurationStatusFinalIndicator = portMirrorConfigurationStatus.getFinalIndicator();
-            this.portMirrorConfigurationStatusRequestStatus = portMirrorConfigurationStatus.getRequestStatus().toString();
-            this.portMirrorConfigurationStatusResponseCode = portMirrorConfigurationStatus.getResponseCode();
-            this.portMirrorConfigurationStatusResponseMessage = portMirrorConfigurationStatus.getResponseMessage();
-            this.portMirrorConfigurationStatusResponseTimestamp = portMirrorConfigurationStatus.getResponseTimestamp();
-        }
-    }
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurationsRepository.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurationsRepository.java
deleted file mode 100755
index 1d57c86..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurationsRepository.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-
-@Transactional
-public interface OperationalPortMirrorConfigurationsRepository extends CrudRepository<OperationalPortMirrorConfigurations, Long> {
-
-    List<OperationalPortMirrorConfigurations> findByConfigurationId(String configurationId);
-    long deleteByConfigurationId(String configurationId);
-
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadData.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadData.java
deleted file mode 100644
index c63926d..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadData.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.hibernate.validator.constraints.Length;
-
-import javax.persistence.*;
-
-@Entity(name = "OPERATIONAL_PRELOAD_DATA")
-@Table(name="OPERATIONAL_PRELOAD_DATA")
-@IdClass(PreloadDataKey.class)
-public class OperationalPreloadData {
-
-    @Id
-    @Length(max = 100)
-    @Column(length = 100)
-    private String preloadId;
-
-    @Id
-    @Length(max = 25)
-    @Column(length = 25)
-    private String preloadType;
-
-    @Lob
-    @Column(length=10000)
-    private String preloadData;
-
-    public OperationalPreloadData() {
-        this.preloadId = "";
-        this.preloadType = "";
-        this.preloadData = "";
-    }
-
-    public OperationalPreloadData(String preloadId, String preloadType, String preloadData) {
-        this.preloadId = preloadId;
-        this.preloadType = preloadType;
-        this.preloadData = preloadData;
-    }
-
-    public String getPreloadId() {
-        return preloadId;
-    }
-
-    public void setPreloadId(String preloadId) {
-        this.preloadId = preloadId;
-    }
-
-    public String getPreloadType() {
-        return preloadType;
-    }
-
-    public void setPreloadType(String preloadType) {
-        this.preloadType = preloadType;
-    }
-
-    public String getPreloadData() {
-        return preloadData;
-    }
-
-    public void setPreloadData(String preloadData) {
-        this.preloadData = preloadData;
-    }
-
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadDataRepository.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadDataRepository.java
deleted file mode 100644
index 34df132..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadDataRepository.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.springframework.data.repository.CrudRepository;
-
-import java.util.List;
-
-
-public interface OperationalPreloadDataRepository extends CrudRepository<OperationalPreloadData, Long> {
-
-    List<OperationalPreloadData> findByPreloadIdAndPreloadType(String preloadId, String preloadType);
-    long deleteByPreloadIdAndPreloadType(String preloadId, String preloadType);
-
-}
-
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServices.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServices.java
deleted file mode 100644
index 5686c4c..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServices.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.hibernate.validator.constraints.Length;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiRequestStatusEnumeration;
-import org.onap.sdnc.apps.ms.gra.swagger.model.GenericResourceApiServicestatusServiceStatus;
-
-import javax.persistence.*;
-
-@Entity(name="OPERATIONAL_GRA_SERVICES")
-@Table(name="OPERATIONAL_GRA_SERVICES")
-public class OperationalServices {
-    @Id
-    @Length(max = 100)
-    @Column(length = 100)
-    String svcInstanceId;
-
-    @Lob
-    String svcData;
-
-    // Service status fields
-    String serviceStatusResponseCode;
-
-    String serviceStatusResponseMessage;
-
-    String serviceStatusFinalIndicator;
-
-    String serviceStatusRequestStatus;
-
-    String serviceStatusAction;
-
-    String serviceStatusRpcName;
-
-    String serviceStatusRpcAction;
-
-    String serviceStatusResponseTimestamp;
-
-    public String getSvcInstanceId() {
-        return svcInstanceId;
-    }
-
-    public OperationalServices() {
-        this.svcInstanceId = "";
-        this.svcData = "";
-    }
-
-    public OperationalServices(String svcInstanceId, String svcData, GenericResourceApiServicestatusServiceStatus serviceStatus) {
-        this.svcInstanceId = svcInstanceId;
-        this.svcData = svcData;
-        if (serviceStatus != null) {
-            this.serviceStatusAction = serviceStatus.getAction();
-            this.serviceStatusFinalIndicator = serviceStatus.getFinalIndicator();
-            this.serviceStatusRequestStatus = serviceStatus.getRequestStatus().toString();
-            this.serviceStatusResponseCode = serviceStatus.getResponseCode();
-            this.serviceStatusResponseMessage = serviceStatus.getResponseMessage();
-            this.serviceStatusResponseTimestamp = serviceStatus.getResponseTimestamp();
-        }
-    }
-
-    public void setSvcInstanceId(String svcInstanceId) {
-        this.svcInstanceId = svcInstanceId;
-    }
-
-    public String getSvcData() {
-        return svcData;
-    }
-
-    public void setSvcData(String svcData) {
-        this.svcData = svcData;
-    }
-
-    public String getServiceStatusResponseCode() {
-        return serviceStatusResponseCode;
-    }
-
-    public void setServiceStatusResponseCode(String serviceStatusResponseCode) {
-        this.serviceStatusResponseCode = serviceStatusResponseCode;
-    }
-
-    public String getServiceStatusResponseMessage() {
-        return serviceStatusResponseMessage;
-    }
-
-    public void setServiceStatusResponseMessage(String serviceStatusResponseMessage) {
-        this.serviceStatusResponseMessage = serviceStatusResponseMessage;
-    }
-
-    public String getServiceStatusFinalIndicator() {
-        return serviceStatusFinalIndicator;
-    }
-
-    public void setServiceStatusFinalIndicator(String serviceStatusFinalIndicator) {
-        this.serviceStatusFinalIndicator = serviceStatusFinalIndicator;
-    }
-
-    public String getServiceStatusRequestStatus() {
-        return serviceStatusRequestStatus;
-    }
-
-    public void setServiceStatusRequestStatus(String serviceStatusRequestStatus) {
-        this.serviceStatusRequestStatus = serviceStatusRequestStatus;
-    }
-
-    public String getServiceStatusAction() {
-        return serviceStatusAction;
-    }
-
-    public void setServiceStatusAction(String serviceStatusAction) {
-        this.serviceStatusAction = serviceStatusAction;
-    }
-
-    public String getServiceStatusRpcName() {
-        return serviceStatusRpcName;
-    }
-
-    public void setServiceStatusRpcName(String serviceStatusRpcName) {
-        this.serviceStatusRpcName = serviceStatusRpcName;
-    }
-
-    public String getServiceStatusRpcAction() {
-        return serviceStatusRpcAction;
-    }
-
-    public void setServiceStatusRpcAction(String serviceStatusRpcAction) {
-        this.serviceStatusRpcAction = serviceStatusRpcAction;
-    }
-
-    public String getServiceStatusResponseTimestamp() {
-        return serviceStatusResponseTimestamp;
-    }
-
-    public void setServiceStatusResponseTimestamp(String serviceStatusResponseTimestamp) {
-        this.serviceStatusResponseTimestamp = serviceStatusResponseTimestamp;
-    }
-
-
-    public GenericResourceApiServicestatusServiceStatus getServiceStatus() {
-        GenericResourceApiServicestatusServiceStatus serviceStatus = new GenericResourceApiServicestatusServiceStatus();
-        serviceStatus.setAction(serviceStatusAction);
-        serviceStatus.setFinalIndicator(serviceStatusFinalIndicator);
-        serviceStatus.setRequestStatus(GenericResourceApiRequestStatusEnumeration.fromValue(serviceStatusRequestStatus));
-        serviceStatus.setResponseCode(serviceStatusResponseCode);
-        serviceStatus.setResponseMessage(serviceStatusResponseMessage);
-        serviceStatus.setResponseTimestamp(serviceStatusResponseTimestamp);
-
-        return(serviceStatus);
-    }
-
-    public void setServiceStatus(GenericResourceApiServicestatusServiceStatus serviceStatus) {
-        this.serviceStatusAction = serviceStatus.getAction();
-        this.serviceStatusFinalIndicator = serviceStatus.getFinalIndicator();
-        if (serviceStatus.getRequestStatus() != null) {
-            this.serviceStatusRequestStatus = serviceStatus.getRequestStatus().toString();
-        }
-
-        this.serviceStatusResponseCode = serviceStatus.getResponseCode();
-        this.serviceStatusResponseMessage = serviceStatus.getResponseMessage();
-        this.serviceStatusResponseTimestamp = serviceStatus.getResponseTimestamp();
-    }
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServicesRepository.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServicesRepository.java
deleted file mode 100644
index 15b2acc..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServicesRepository.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SDNC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.sdnc.apps.ms.gra.data;
-
-import org.springframework.data.repository.CrudRepository;
-
-import java.util.List;
-
-
-public interface OperationalServicesRepository extends CrudRepository<OperationalServices, Long> {
-
-    List<OperationalServices> findBySvcInstanceId(String svcInstanceId);
-    long deleteBySvcInstanceId(String svcInstanceId);
-
-}
-
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/PreloadDataKey.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/PreloadDataKey.java
deleted file mode 100644
index 34f010c..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/PreloadDataKey.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.data;
-
-import java.io.Serializable;
-
-public class PreloadDataKey implements Serializable {
-    private String preloadId = "";
-    private String preloadType = "";
-
-    public PreloadDataKey() {
-        this.preloadId = "";
-        this.preloadType = "";
-    }
-
-    public PreloadDataKey(String preloadId, String preloadType) {
-        this.preloadId = preloadId;
-        this.preloadType = preloadType;
-    }
-
-    @Override
-    public int hashCode() {
-        return preloadId.hashCode() + preloadType.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return (obj instanceof PreloadDataKey &&
-                preloadId.equals(((PreloadDataKey)obj).preloadId) &&
-                preloadType.equals(((PreloadDataKey)obj).preloadType));
-    }
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/VfModulesKey.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/VfModulesKey.java
deleted file mode 100644
index bf44cc9..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/VfModulesKey.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.data;
-
-import java.io.Serializable;
-
-public class VfModulesKey implements Serializable {
-    private String svcInstanceId = "";
-    private String vnfId = "";
-    private String vfModuleId = "";
-
-    public VfModulesKey() {
-        this.svcInstanceId = "";
-        this.vnfId = "";
-        this.vfModuleId = "";
-    }
-
-    public VfModulesKey(String svcInstanceId, String vnfId, String vfModuleId) {
-        this.svcInstanceId = svcInstanceId;
-        this.vnfId = vnfId;
-        this.vfModuleId = vfModuleId;
-    }
-
-    @Override
-    public int hashCode() {
-        return svcInstanceId.hashCode() + vnfId.hashCode()+vfModuleId.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return (obj instanceof VfModulesKey &&
-                svcInstanceId.equals(((VfModulesKey)obj).svcInstanceId) &&
-                vnfId.equals(((VfModulesKey)obj).vnfId) &&
-                vfModuleId.equals(((VfModulesKey)obj).vfModuleId));
-    }
-}
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/VnfsKey.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/VnfsKey.java
deleted file mode 100644
index f19c95e..0000000
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/VnfsKey.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.onap.sdnc.apps.ms.gra.data;
-
-import java.io.Serializable;
-
-public class VnfsKey implements Serializable {
-    private String svcInstanceId = "";
-    private String vnfId = "";
-
-    public VnfsKey() {
-        this.svcInstanceId = "";
-        this.vnfId = "";
-    }
-
-    public VnfsKey(String svcInstanceId, String vnfId) {
-        this.svcInstanceId = svcInstanceId;
-        this.vnfId = vnfId;
-    }
-
-    @Override
-    public int hashCode() {
-        return svcInstanceId.hashCode() + vnfId.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return (obj instanceof VnfsKey &&
-                svcInstanceId.equals(((VnfsKey)obj).svcInstanceId) &&
-                vnfId.equals(((VnfsKey)obj).vnfId));
-    }
-}
diff --git a/ms/generic-resource-api/src/main/resources/application.properties b/ms/generic-resource-api/src/main/resources/application.properties
deleted file mode 100644
index 2be250b..0000000
--- a/ms/generic-resource-api/src/main/resources/application.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-
-springfox.documentation.swagger.v2.path=/api-docs
-server.servlet.context-path=/restconf
-server.port=8080
-spring.jackson.date-format=org.onap.sdnc.apps.ms.gra.swagger.RFC3339DateFormat
-spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
-logging.level.com.att=${LOG_LEVEL}
-logging.level.org.onap=${LOG_LEVEL}
-spring.datasource.url=jdbc:mariadb://${MYSQL_DB_HOST}:3306/${MYSQL_DATABASE}
-spring.datasource.hikari.data-source-properties.useUnicode=true
-spring.datasource.hikari.data-source-properties.characterEncoding=UTF-8
-spring.datasource.username=${MYSQL_USER}
-spring.datasource.password=${MYSQL_PASSWORD}
-spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-spring.datasource.platform=mysql
-spring.datasource.testWhileIdle=true
-spring.datasource.validationQuery=SELECT 1
-spring.jpa.show-sql=true
-spring.jpa.properties.hibernate.default_schema=${MYSQL_DATABASE}
-spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
-# spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
-spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-
-spring.jpa.database=mysql
diff --git a/ms/generic-resource-api/src/main/resources/data-demo.sql b/ms/generic-resource-api/src/main/resources/data-demo.sql
deleted file mode 100644
index 763d0cb..0000000
--- a/ms/generic-resource-api/src/main/resources/data-demo.sql
+++ /dev/null
@@ -1,1396 +0,0 @@
--- MySQL dump 10.13  Distrib 5.6.50, for Linux (x86_64)
---
--- Host: localhost    Database: sdnctl
--- ------------------------------------------------------
--- Server version	5.6.50
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Dumping data for table `ALLOTTED_RESOURCE_MODEL`
---
-
-LOCK TABLES `ALLOTTED_RESOURCE_MODEL` WRITE;
-/*!40000 ALTER TABLE `ALLOTTED_RESOURCE_MODEL` DISABLE KEYS */;
-INSERT INTO `ALLOTTED_RESOURCE_MODEL` VALUES ('0ac79616-4f69-4936-8f31-5ce982282be2','null','d3f33c8f-bd9f-447d-b4d2-ad6fc5aea83f','2abcec58-fe97-478e-a58f-35c8cdc3ec3d','1.0',NULL,NULL,NULL,NULL,'Tunnel XConnect',NULL,'Tunnel XConnect');
-INSERT INTO `ALLOTTED_RESOURCE_MODEL` VALUES ('1b8908b1-0af7-4fa2-980d-a43bc85ef8f5','null','176f26ba-9bf8-46b6-b54d-53cd0c14183d','d848e8a2-5360-445a-b98d-6f3d2a787dc5','1.0',NULL,'Y',NULL,'TunnelXConn','TunnelXConn',NULL,NULL);
-INSERT INTO `ALLOTTED_RESOURCE_MODEL` VALUES ('1e7a8782-7bf6-4726-a26e-a5e4eca6cba1','null','5255679f-0d50-49e3-82f1-e51bca8cf6d1','f6d6767d-c015-4924-9052-97659f8a16e3','1.0',NULL,NULL,NULL,NULL,'IP Mux Demux',NULL,'IP Mux Demux');
-INSERT INTO `ALLOTTED_RESOURCE_MODEL` VALUES ('28978eea-6b39-497a-9ee8-ce2f92159235','null','19c5417a-fead-41f2-a29e-c1bd7593601f','5cd256a5-64a5-46cf-bc8f-4131533cc8e2','1.0',NULL,'Y',NULL,'BRG','BRG',NULL,NULL);
-INSERT INTO `ALLOTTED_RESOURCE_MODEL` VALUES ('8892322d-8797-4ecd-a4b1-bf0cdc426541','null','176f26ba-9bf8-46b6-b54d-53cd0c14183d','d848e8a2-5360-445a-b98d-6f3d2a787dc5','1.0',NULL,'Y',NULL,'TunnelXConn','TunnelXConn',NULL,NULL);
-INSERT INTO `ALLOTTED_RESOURCE_MODEL` VALUES ('9f8dbc4f-d7f6-421b-a2fe-3c09b1068622','null','b8064c7c-2390-4eab-9472-f0cdde3b1b9e','1bba1911-e393-46fb-a773-a93d29261cc2','1.0',NULL,NULL,NULL,NULL,'IP Mux Demux',NULL,'IP Mux Demux');
-INSERT INTO `ALLOTTED_RESOURCE_MODEL` VALUES ('acc15553-e8fa-41f1-a260-e4588290dd9d','null','b8064c7c-2390-4eab-9472-f0cdde3b1b9e','1bba1911-e393-46fb-a773-a93d29261cc2','1.0',NULL,NULL,NULL,NULL,'IP Mux Demux',NULL,'IP Mux Demux');
-INSERT INTO `ALLOTTED_RESOURCE_MODEL` VALUES ('ad07a460-4224-4b55-8aab-cbd3d3c3310b','null','b5bbf19a-9fed-4fc0-a61e-e44d246f37b8','f59db7f5-74fb-4dbd-94aa-90b2ce4ac627','3.0',NULL,'Y',NULL,NULL,'Tunnel XConnect',NULL,'Tunnel XConnect');
-INSERT INTO `ALLOTTED_RESOURCE_MODEL` VALUES ('bb50f135-22d2-4b64-98ab-e6aed28608e8','null','d3f33c8f-bd9f-447d-b4d2-ad6fc5aea83f','2abcec58-fe97-478e-a58f-35c8cdc3ec3d','1.0',NULL,NULL,NULL,NULL,'Tunnel XConnect',NULL,'Tunnel XConnect');
-INSERT INTO `ALLOTTED_RESOURCE_MODEL` VALUES ('cc1e0245-fd9c-407a-9199-bcfa247d7718','null','19c5417a-fead-41f2-a29e-c1bd7593601f','5cd256a5-64a5-46cf-bc8f-4131533cc8e2','1.0',NULL,'Y',NULL,'BRG','BRG',NULL,NULL);
-INSERT INTO `ALLOTTED_RESOURCE_MODEL` VALUES ('f66a5a6a-30f4-40ef-a3b6-ba779a522fd0','null','5d623af7-1ae4-4e7d-933b-b09bd4407f40','dac644a3-2b2c-4586-862d-9a9a4b1eb5e1','1.0',NULL,NULL,NULL,NULL,'Allotted Resource',NULL,'Allotted Resource');
-/*!40000 ALTER TABLE `ALLOTTED_RESOURCE_MODEL` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Dumping data for table `NETWORK_MODEL`
---
-
-LOCK TABLES `NETWORK_MODEL` WRITE;
-/*!40000 ALTER TABLE `NETWORK_MODEL` DISABLE KEYS */;
-INSERT INTO `NETWORK_MODEL` VALUES ('367a8ba9-057a-4506-b106-fbae818597c6','6794ec22-95ff-4b00-8846-b1148e90df54','!!com.att.sdnctl.uebclient.SdncNetworkServiceModel\ndescription: null\nimports:\n- Service_Admin: {file: resource-ServiceAdmin-template.yml}\n- IP_MUX_Demux: {file: resource-IpMuxDemux-template.yml}\n- Tunnel_Xconn: {file: resource-TunnelXconn-template.yml}\n- vHNF for DHV Test: {file: resource-VhnfForDhvTest-template.yml}\nmetadata: {invariantUUID: 7b0fafc1-83df-4590-9460-b5a8d9f9f277, UUID: 6794ec22-95ff-4b00-8846-b1148e90df54,\n  name: SD-WAN, description: \'Standard Wan connector, redoing this for sdnc again\n    as they got already deployed.\', type: Service, category: Network L1-3, serviceEcompNaming: false,\n  serviceHoming: false}\ntopology_template:\n  node_templates:\n    Pri_IP_MUX_Demux 1:\n      type: com.att.d2.resource.vf.IpMuxDemux\n      metadata: {invariantUUID: f110ef53-a0a6-4d72-ab91-fd88a835e8c4, UUID: 79b0a3cc-c5f9-4831-aa72-b2884ed0bd55,\n        customizationUUID: 211bcbd5-de25-41bb-a758-edd32220461d, version: \'1.0\', name: IP_MUX_Demux,\n        description: 1/17, type: VF, category: Allotted Resource, subcategory: Allotted Resource}\n    Pri_Service_Admin 5:\n      type: com.att.d2.resource.vf.ServiceAdmin\n      metadata: {invariantUUID: 462edf71-1a3c-487b-bf55-497460ab7de3, UUID: b51acc89-1c55-4586-b82b-6480b16339e9,\n        customizationUUID: 22b1ed87-2ca5-42f5-9e2e-20ad5bfb097e, version: \'1.0\', name: Service_Admin,\n        description: Service Version, type: VF, category: Allotted Resource, subcategory: Allotted Resource}\n    Sec_IP_MUX_Demux 3:\n      type: com.att.d2.resource.vf.IpMuxDemux\n      metadata: {invariantUUID: f110ef53-a0a6-4d72-ab91-fd88a835e8c4, UUID: 79b0a3cc-c5f9-4831-aa72-b2884ed0bd55,\n        customizationUUID: 96e090a4-93dd-43a2-9d87-a746ee7e53cd, version: \'1.0\', name: IP_MUX_Demux,\n        description: 1/17, type: VF, category: Allotted Resource, subcategory: Allotted Resource}\n    Pri_Tunnel_Xconn 9:\n      type: com.att.d2.resource.vf.TunnelXconn\n      metadata: {invariantUUID: b7a1b78e-6b6b-4b36-9698-8c9530da14af, UUID: a2a57fb1-213d-45a4-acd8-6a0f7b4e54b1,\n        customizationUUID: 5b9bee43-f537-4fb3-9e8b-4de9f714d28a, version: \'1.0\', name: Tunnel_Xconn,\n        description: Tunnel, type: VF, category: Allotted Resource, subcategory: Allotted Resource}\n    Sec_Service_Admin 7:\n      type: com.att.d2.resource.vf.ServiceAdmin\n      metadata: {invariantUUID: 462edf71-1a3c-487b-bf55-497460ab7de3, UUID: b51acc89-1c55-4586-b82b-6480b16339e9,\n        customizationUUID: 5431e571-3df5-423a-99bc-0b020ecac97b, version: \'1.0\', name: Service_Admin,\n        description: Service Version, type: VF, category: Allotted Resource, subcategory: Allotted Resource}\n    Sec_Tunnel_Xconn 11:\n      type: com.att.d2.resource.vf.TunnelXconn\n      metadata: {invariantUUID: b7a1b78e-6b6b-4b36-9698-8c9530da14af, UUID: a2a57fb1-213d-45a4-acd8-6a0f7b4e54b1,\n        customizationUUID: 367a8ba9-057a-4506-b106-fbae818597c6, version: \'1.0\', name: Tunnel_Xconn,\n        description: Tunnel, type: VF, category: Allotted Resource, subcategory: Allotted Resource}\n    vHNF for DHV Test 17:\n      type: com.att.d2.resource.vf.VhnfForDhvTest\n      metadata: {invariantUUID: 6ea0b528-e303-4686-aa77-aa2fcbdccb96, UUID: 619c7cd3-76a9-46a8-b01b-c1f236b14d68,\n        customizationUUID: 2eb202d1-b36b-4c63-821f-4a163abaed42, version: \'1.0\', name: vHNF for DHV Test,\n        description: \'vHNF for DHV testing 1_19_17. \', type: VF, category: Network L2-3,\n        subcategory: Infrastructure}\n  groups:\n    vhnffordhvtest17..VhnfForDhvTest..base_TEST..module-0:\n      type: com.att.d2.groups.VfModule\n      metadata: {vfModuleModelName: VhnfForDhvTest..base_TEST..module-0, vfModuleModelInvariantUUID: f5696ec0-ec71-4916-bf3b-93a654efcba4,\n        vfModuleModelUUID: ebc3d18c-3e62-4c24-bcd6-961e98701a0a, vfModuleModelVersion: \'1\',\n        vfModuleModelCustomizationUUID: 63f9560a-4603-4e3b-8fb7-55f8ea06ee21}\n      properties: {min_vf_module_instances: 1, vf_module_label: base_TEST, max_vf_module_instances: 1,\n        vf_module_type: Base, vf_module_description: null, initial_count: 1, volume_group: false}\n  substitution_mappings:\n    node_type: com.att.d2.service.SdWan\n    capabilities:\n      vHNF for DHV Test 17.disk.write.bytes:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Volume of writes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.write.bytes, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.device.write.bytes.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of writes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.write.bytes.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      Sec_IP_MUX_Demux 3.feature:\n        type: tosca.capabilities.Node\n        occurrences: [1, UNBOUNDED]\n      vHNF for DHV Test 17.disk.usage:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: The physical size in bytes of the image container on the host,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.usage, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.device.latency:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average disk latency per device, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: ms, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.latency, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.memory.resident:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Volume of RAM used by the instance on the physical machine,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: MB, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: memory.resident, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.network.outgoing.packets.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of outgoing packets, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: packet/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.outgoing.packets.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.device.write.bytes:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Volume of writes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.write.bytes, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.device.allocation:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: The amount of disk per device occupied by the instance on the host machine,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.allocation, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      Pri_Service_Admin 5.feature:\n        type: tosca.capabilities.Node\n        occurrences: [1, UNBOUNDED]\n      vHNF for DHV Test 17.disk.allocation:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: The amount of disk occupied by the instance on the host machine,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.allocation, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.device.write.requests:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of write requests, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: request, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.write.requests, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.attachment:\n        type: tosca.capabilities.Attachment\n        occurrences: [1, UNBOUNDED]\n      vHNF for DHV Test 17.disk.capacity:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: The amount of disk that the instance can see,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.capacity, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.network.incoming.packets.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of incoming packets, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: packet/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.incoming.packets.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.latency:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average disk latency, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: ms, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.latency, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.host:\n        type: tosca.capabilities.Container\n        occurrences: [1, UNBOUNDED]\n        valid_source_types: [tosca.nodes.SoftwareComponent]\n        properties:\n          num_cpus: {type: integer, required: false}\n          disk_size: {type: scalar-unit.size, required: false}\n          cpu_frequency: {type: scalar-unit.frequency, required: false}\n          mem_size: {type: scalar-unit.size, required: false}\n      vHNF for DHV Test 17.disk.device.read.bytes.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of reads, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.read.bytes.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.ephemeral.size:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Size of ephemeral disk, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: GB, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.ephemeral.size, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.cpu_util:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average CPU utilization, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: \'%\', description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: cpu_util, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.write.requests:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of write requests, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: request, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.write.requests, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.read.requests:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of read requests, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: request, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.read.requests, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.cpu:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: CPU time used, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: ns, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: cpu, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.write.bytes.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of writes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.write.bytes.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.network.incoming.bytes:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of incoming bytes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.incoming.bytes, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.scalable:\n        type: tosca.capabilities.Scalable\n        occurrences: [1, UNBOUNDED]\n        properties:\n          max_instances: {type: integer, default: 1, required: false}\n          min_instances: {type: integer, default: 1, required: false}\n          default_instances: {type: integer, required: false}\n      vHNF for DHV Test 17.cpu.delta:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: CPU time used since previous datapoint,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Delta, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: ns, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: cpu.delta, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.instance:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Existence of instance, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: instance, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: instance, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.memory:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Volume of RAM allocated to the instance,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: MB, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: memory, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.read.bytes:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Volume of reads, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.read.bytes, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.iops:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average disk iops, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: count/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.iops, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.device.usage:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: The physical size in bytes of the image container on the host per device,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.usage, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.device.read.requests:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of read requests, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: request, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.read.requests, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      Sec_Service_Admin 7.feature:\n        type: tosca.capabilities.Node\n        occurrences: [1, UNBOUNDED]\n      vHNF for DHV Test 17.disk.device.capacity:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: The amount of disk per device that the instance can see,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.capacity, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.os:\n        type: tosca.capabilities.OperatingSystem\n        occurrences: [1, UNBOUNDED]\n        properties:\n          type: {type: string, required: false}\n          distribution: {type: string, required: false}\n          version: {type: version, required: false}\n          architecture: {type: string, required: false}\n      Sec_Tunnel_Xconn 11.feature:\n        type: tosca.capabilities.Node\n        occurrences: [1, UNBOUNDED]\n      vHNF for DHV Test 17.binding:\n        type: tosca.capabilities.network.Bindable\n        occurrences: [0, UNBOUNDED]\n        valid_source_types: [com.att.d2.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface]\n      vHNF for DHV Test 17.disk.read.bytes.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of reads, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.read.bytes.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.device.read.bytes:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Volume of reads, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.read.bytes, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.feature:\n        type: tosca.capabilities.Node\n        occurrences: [1, UNBOUNDED]\n      Pri_Tunnel_Xconn 9.feature:\n        type: tosca.capabilities.Node\n        occurrences: [1, UNBOUNDED]\n      vHNF for DHV Test 17.vcpus:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of virtual CPUs allocated to the instance,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: vcpu, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: vcpus, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.device.iops:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average disk iops per device, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: count/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.iops, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.network.incoming.packets:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of incoming packets, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: packet, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.incoming.packets, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.write.requests.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of write requests, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: request/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.write.requests.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.network.incoming.bytes.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of incoming bytes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.incoming.bytes.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.network.outpoing.packets:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of outgoing packets, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: packet, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.outpoing.packets, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.memory.usage:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Volume of RAM used by the instance from the amount of its allocated memory,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: MB, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: memory.usage, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.network.outgoing.bytes:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of outgoing bytes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.outgoing.bytes, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.endpoint:\n        type: tosca.capabilities.Endpoint.Admin\n        occurrences: [1, UNBOUNDED]\n        properties:\n          port_name: {type: string, required: false}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          secure: {type: boolean, default: true, required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.network.outgoing.bytes.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of outgoing bytes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.outgoing.bytes.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      Pri_IP_MUX_Demux 1.feature:\n        type: tosca.capabilities.Node\n        occurrences: [1, UNBOUNDED]\n      vHNF for DHV Test 17.disk.root.size:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Size of root disk, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: GB, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.root.size, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.device.write.requests.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of write requests, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: request/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.write.requests.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      vHNF for DHV Test 17.disk.device.read.requests.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of read requests, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: request/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.read.requests.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n    requirements:\n      Sec_IP_MUX_Demux 3.dependency:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Node\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.DependsOn\n      Pri_Tunnel_Xconn 9.service_dependency:\n        occurrences: [1, 1]\n        capability: com.att.d2.capabilities.AllottedResource\n        node: tosca.services.Root\n        relationship: tosca.relationships.DependsOn\n      Pri_IP_MUX_Demux 1.dependency:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Node\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.DependsOn\n      Pri_Service_Admin 5.dependency:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Node\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.DependsOn\n      Pri_IP_MUX_Demux 1.service_dependency:\n        occurrences: [1, 1]\n        capability: com.att.d2.capabilities.AllottedResource\n        node: tosca.services.Root\n        relationship: tosca.relationships.DependsOn\n      Pri_Service_Admin 5.service_dependency:\n        occurrences: [1, 1]\n        capability: com.att.d2.capabilities.AllottedResource\n        node: tosca.services.Root\n        relationship: tosca.relationships.DependsOn\n      Sec_IP_MUX_Demux 3.service_dependency:\n        occurrences: [1, 1]\n        capability: com.att.d2.capabilities.AllottedResource\n        node: tosca.services.Root\n        relationship: tosca.relationships.DependsOn\n      vHNF for DHV Test 17.dependency:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Node\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.DependsOn\n      vHNF for DHV Test 17.local_storage:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Attachment\n        node: tosca.nodes.BlockStorage\n        relationship: tosca.relationships.AttachesTo\n      vHNF for DHV Test 17.link:\n        occurrences: [1, 1]\n        capability: tosca.capabilities.network.Linkable\n        relationship: tosca.relationships.network.LinksTo\n      Pri_Tunnel_Xconn 9.dependency:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Node\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.DependsOn\n      Sec_Tunnel_Xconn 11.service_dependency:\n        occurrences: [1, 1]\n        capability: com.att.d2.capabilities.AllottedResource\n        node: tosca.services.Root\n        relationship: tosca.relationships.DependsOn\n      Sec_Service_Admin 7.dependency:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Node\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.DependsOn\n      Sec_Tunnel_Xconn 11.dependency:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Node\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.DependsOn\n      Sec_Service_Admin 7.service_dependency:\n        occurrences: [1, 1]\n        capability: com.att.d2.capabilities.AllottedResource\n        node: tosca.services.Root\n        relationship: tosca.relationships.DependsOn\ntosca_definitions_version: tosca_simple_yaml_1_0\n','b7a1b78e-6b6b-4b36-9698-8c9530da14af','a2a57fb1-213d-45a4-acd8-6a0f7b4e54b1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `NETWORK_MODEL` VALUES ('4138175b-d013-4b8a-a0d4-c94ec2657205','f0d19319-a926-4f5c-bf63-06d417c8f3ab','null','206d5e6c-4cba-4c14-b942-5d946c881869','9b7c1cbe-ddcd-458c-8792-d76391419b72','NEUTRON','VcpesvcInfra0412a.cpe_public','NEUTRON',NULL,NULL,NULL,'Y',NULL,'N',NULL,NULL,'N',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'1.0');
-INSERT INTO `NETWORK_MODEL` VALUES ('61daffc9-c35d-4c04-b0c7-e9b460d6ae5a','f0d19319-a926-4f5c-bf63-06d417c8f3ab','null','206d5e6c-4cba-4c14-b942-5d946c881869','9b7c1cbe-ddcd-458c-8792-d76391419b72','NEUTRON','VcpesvcInfra0412a.cpe_signal','NEUTRON',NULL,NULL,NULL,'Y',NULL,'N',NULL,NULL,'N',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'1.0');
-INSERT INTO `NETWORK_MODEL` VALUES ('b0cf3385-a390-488c-b6a0-d879fb4a4825','12eb33fa-b221-4d87-939c-d808b5799a7c','null','206d5e6c-4cba-4c14-b942-5d946c881869','9b7c1cbe-ddcd-458c-8792-d76391419b72','NEUTRON','VcpesvcVbng0412a.bng_mux','NEUTRON',NULL,NULL,NULL,'Y',NULL,'N',NULL,NULL,'N',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'1.0');
-INSERT INTO `NETWORK_MODEL` VALUES ('e2d7ba3f-5e86-49ad-a2f3-46f24b046f41','12eb33fa-b221-4d87-939c-d808b5799a7c','null','206d5e6c-4cba-4c14-b942-5d946c881869','9b7c1cbe-ddcd-458c-8792-d76391419b72','NEUTRON','VcpesvcVbng0412a.brg_bng','NEUTRON',NULL,NULL,NULL,'Y',NULL,'N',NULL,NULL,'N',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'1.0');
-INSERT INTO `NETWORK_MODEL` VALUES ('fe4cdfc8-6415-428f-91f0-c0b34a7f3128','b4c3eac7-9f57-4330-9a05-c7d5595505ea','null','206d5e6c-4cba-4c14-b942-5d946c881869','9b7c1cbe-ddcd-458c-8792-d76391419b72','NEUTRON','VcpesvcVgmux0412a.mux_gw','NEUTRON',NULL,NULL,NULL,'Y',NULL,'N',NULL,NULL,'N',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'1.0');
-/*!40000 ALTER TABLE `NETWORK_MODEL` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Dumping data for table `SERVICE_MODEL`
---
-
-LOCK TABLES `SERVICE_MODEL` WRITE;
-/*!40000 ALTER TABLE `SERVICE_MODEL` DISABLE KEYS */;
-INSERT INTO `SERVICE_MODEL` VALUES ('0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('00e50cbd-ef0f-4b28-821e-f2b583752dd3','!!com.att.sdnctl.uebclient.SdncNetworkServiceModel\ndescription: null\nimports:\n- Second try_vbng: {file: resource-SecondTryVbng-template.yml}\nmetadata: {invariantUUID: dbf9288d-18ef-4d28-82cb-29373028f367, UUID: 00e50cbd-ef0f-4b28-821e-f2b583752dd3,\n  name: vBNG_0202, description: Virtual, type: Service, category: Network L1-3, serviceEcompNaming: false,\n  serviceHoming: false}\ntopology_template:\n  node_templates:\n    Second try_vbng 1:\n      type: com.att.d2.resource.vf.SecondTryVbng\n      metadata: {invariantUUID: 57516bfc-35f5-4169-a4ee-66a495a9c645, UUID: f196fdad-9b74-4fcc-9d38-72f4a71aea77,\n        customizationUUID: 72a9f413-4d16-4f7b-b0bc-d98f87997f01, version: \'1.0\', name: Second try_vbng,\n        description: ntwork, type: VF, category: Generic, subcategory: Network Elements}\n  groups:\n    secondtry_vbng1..SecondTryVbng..VSR_base_hot..module-0:\n      type: com.att.d2.groups.VfModule\n      metadata: {vfModuleModelName: SecondTryVbng..VSR_base_hot..module-0, vfModuleModelInvariantUUID: b73fcd7d-f374-4e7e-a905-f5e58eb8a34a,\n        vfModuleModelUUID: 3b3ff306-b493-4b3d-bb3d-baa13c2d82c7, vfModuleModelVersion: \'1\',\n        vfModuleModelCustomizationUUID: d106e920-0188-48b7-9f90-ae7c1ab43b73}\n      properties: {min_vf_module_instances: 1, vf_module_label: VSR_base_hot, max_vf_module_instances: 1,\n        vf_module_type: Base, vf_module_description: null, volume_group: false, initial_count: 1}\n  substitution_mappings:\n    node_type: com.att.d2.service.Vbng0202\n    capabilities:\n      Second try_vbng 1.attachment_iom_ctrl_fabric_0_port:\n        type: tosca.capabilities.Attachment\n        occurrences: [0, UNBOUNDED]\n      Second try_vbng 1.os_CPM:\n        type: tosca.capabilities.OperatingSystem\n        occurrences: [1, UNBOUNDED]\n        properties:\n          distribution: {type: string, required: false}\n          type: {type: string, required: false}\n          version: {type: version, required: false}\n          architecture: {type: string, required: false}\n      Second try_vbng 1.scalable_CPM:\n        type: tosca.capabilities.Scalable\n        occurrences: [1, UNBOUNDED]\n        properties:\n          max_instances: {type: integer, default: 1, required: false}\n          min_instances: {type: integer, default: 1, required: false}\n          default_instances: {type: integer, required: false}\n      Second try_vbng 1.binding_iom_data_0_port:\n        type: tosca.capabilities.network.Bindable\n        occurrences: [0, UNBOUNDED]\n        valid_source_types: [com.att.d2.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface]\n      Second try_vbng 1.attachment_iom_mgt_0_port:\n        type: tosca.capabilities.Attachment\n        occurrences: [0, UNBOUNDED]\n      Second try_vbng 1.binding_cpm_ctrl_fabric_0_port:\n        type: tosca.capabilities.network.Bindable\n        occurrences: [0, UNBOUNDED]\n        valid_source_types: [com.att.d2.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface]\n      Second try_vbng 1.scalable_IOM:\n        type: tosca.capabilities.Scalable\n        occurrences: [1, UNBOUNDED]\n        properties:\n          max_instances: {type: integer, default: 1, required: false}\n          min_instances: {type: integer, default: 1, required: false}\n          default_instances: {type: integer, required: false}\n      Second try_vbng 1.attachment_iom_data_0_port:\n        type: tosca.capabilities.Attachment\n        occurrences: [0, UNBOUNDED]\n      Second try_vbng 1.host_CPM:\n        type: tosca.capabilities.Container\n        occurrences: [1, UNBOUNDED]\n        valid_source_types: [tosca.nodes.SoftwareComponent]\n        properties:\n          num_cpus: {type: integer, required: false}\n          disk_size: {type: scalar-unit.size, required: false}\n          cpu_frequency: {type: scalar-unit.frequency, required: false}\n          mem_size: {type: scalar-unit.size, required: false}\n      Second try_vbng 1.attachment_cpm_mgt_0_port:\n        type: tosca.capabilities.Attachment\n        occurrences: [0, UNBOUNDED]\n      Second try_vbng 1.binding_iom_data_1_port:\n        type: tosca.capabilities.network.Bindable\n        occurrences: [0, UNBOUNDED]\n        valid_source_types: [com.att.d2.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface]\n      Second try_vbng 1.attachment_iom_data_3_port:\n        type: tosca.capabilities.Attachment\n        occurrences: [0, UNBOUNDED]\n      Second try_vbng 1.binding_iom_mgt_0_port:\n        type: tosca.capabilities.network.Bindable\n        occurrences: [0, UNBOUNDED]\n        valid_source_types: [com.att.d2.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface]\n      Second try_vbng 1.attachment_iom_data_2_port:\n        type: tosca.capabilities.Attachment\n        occurrences: [0, UNBOUNDED]\n      Second try_vbng 1.binding_iom_data_2_port:\n        type: tosca.capabilities.network.Bindable\n        occurrences: [0, UNBOUNDED]\n        valid_source_types: [com.att.d2.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface]\n      Second try_vbng 1.endpoint_CPM:\n        type: tosca.capabilities.Endpoint.Admin\n        occurrences: [1, UNBOUNDED]\n        properties:\n          port_name: {type: string, required: false}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          secure: {type: boolean, default: true, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          url_path: {type: string, required: false}\n      Second try_vbng 1.binding_cpm_mgt_0_port:\n        type: tosca.capabilities.network.Bindable\n        occurrences: [0, UNBOUNDED]\n        valid_source_types: [com.att.d2.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface]\n      Second try_vbng 1.feature:\n        type: tosca.capabilities.Node\n        occurrences: [1, UNBOUNDED]\n      Second try_vbng 1.binding_IOM:\n        type: tosca.capabilities.network.Bindable\n        occurrences: [1, UNBOUNDED]\n      Second try_vbng 1.attachment_cpm_ctrl_fabric_0_port:\n        type: tosca.capabilities.Attachment\n        occurrences: [0, UNBOUNDED]\n      Second try_vbng 1.binding_iom_ctrl_fabric_0_port:\n        type: tosca.capabilities.network.Bindable\n        occurrences: [0, UNBOUNDED]\n        valid_source_types: [com.att.d2.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface]\n      Second try_vbng 1.binding_iom_data_3_port:\n        type: tosca.capabilities.network.Bindable\n        occurrences: [0, UNBOUNDED]\n        valid_source_types: [com.att.d2.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface]\n      Second try_vbng 1.binding_CPM:\n        type: tosca.capabilities.network.Bindable\n        occurrences: [1, UNBOUNDED]\n      Second try_vbng 1.attachment_iom_data_1_port:\n        type: tosca.capabilities.Attachment\n        occurrences: [0, UNBOUNDED]\n      Second try_vbng 1.host_IOM:\n        type: tosca.capabilities.Container\n        occurrences: [1, UNBOUNDED]\n        valid_source_types: [tosca.nodes.SoftwareComponent]\n        properties:\n          num_cpus: {type: integer, required: false}\n          disk_size: {type: scalar-unit.size, required: false}\n          cpu_frequency: {type: scalar-unit.frequency, required: false}\n          mem_size: {type: scalar-unit.size, required: false}\n      Second try_vbng 1.os_IOM:\n        type: tosca.capabilities.OperatingSystem\n        occurrences: [1, UNBOUNDED]\n        properties:\n          distribution: {type: string, required: false}\n          type: {type: string, required: false}\n          version: {type: version, required: false}\n          architecture: {type: string, required: false}\n      Second try_vbng 1.endpoint_IOM:\n        type: tosca.capabilities.Endpoint.Admin\n        occurrences: [1, UNBOUNDED]\n        properties:\n          port_name: {type: string, required: false}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          secure: {type: boolean, default: true, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          url_path: {type: string, required: false}\n    requirements:\n      Second try_vbng 1.local_storage_IOM:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Attachment\n        node: tosca.nodes.BlockStorage\n        relationship: tosca.relationships.AttachesTo\n      Second try_vbng 1.link_iom_ctrl_fabric_0_port:\n        occurrences: [1, 1]\n        capability: tosca.capabilities.network.Linkable\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.network.LinksTo\n      Second try_vbng 1.link_cpm_ctrl_fabric_0_port:\n        occurrences: [1, 1]\n        capability: tosca.capabilities.network.Linkable\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.network.LinksTo\n      Second try_vbng 1.link_cpm_mgt_0_port:\n        occurrences: [1, 1]\n        capability: tosca.capabilities.network.Linkable\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.network.LinksTo\n      Second try_vbng 1.link_iom_data_3_port:\n        occurrences: [1, 1]\n        capability: tosca.capabilities.network.Linkable\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.network.LinksTo\n      Second try_vbng 1.local_storage_CPM:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Attachment\n        node: tosca.nodes.BlockStorage\n        relationship: tosca.relationships.AttachesTo\n      Second try_vbng 1.dependency:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Node\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.DependsOn\n      Second try_vbng 1.link_iom_data_2_port:\n        occurrences: [1, 1]\n        capability: tosca.capabilities.network.Linkable\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.network.LinksTo\n      Second try_vbng 1.link_iom_data_0_port:\n        occurrences: [1, 1]\n        capability: tosca.capabilities.network.Linkable\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.network.LinksTo\n      Second try_vbng 1.link_iom_mgt_0_port:\n        occurrences: [1, 1]\n        capability: tosca.capabilities.network.Linkable\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.network.LinksTo\n      Second try_vbng 1.port:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Attachment\n        node: com.att.d2.resource.cp.nodes.heat.network.neutron.Port\n        relationship: com.att.d2.relationships.AttachesTo\n      Second try_vbng 1.link_iom_data_1_port:\n        occurrences: [1, 1]\n        capability: tosca.capabilities.network.Linkable\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.network.LinksTo\ntosca_definitions_version: tosca_simple_yaml_1_0\n','dbf9288d-18ef-4d28-82cb-29373028f367',NULL,'vBNG_0202','Virtual','Service','Network L1-3','N','Vbng0202','service-Vbng0202-template.yml',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('0a92fd9c-baab-4c03-b4e2-827e2cb9bcc7','!!com.att.sdnctl.uebclient.SdncNetworkServiceModel\ndescription: null\nimports:\n- BK-012317-UUID-VSP: {file: resource-Bk012317UuidVsp-template.yml}\nmetadata: {invariantUUID: 083b57cd-4b76-4924-a64c-610445528063, UUID: 0a92fd9c-baab-4c03-b4e2-827e2cb9bcc7,\n  name: BK-012317-UUID-Service, description: BK-012317-UUID-Service, type: Service,\n  category: Network L1-3, serviceEcompNaming: false, serviceHoming: false}\ntopology_template:\n  inputs:\n    bk012317uuidvsp1_oam_protected_net_id: {type: string, description: OAM network id}\n    bk012317uuidvsp1_ppd_name_0: {type: string, description: name of the PCRF PD instance}\n  node_templates:\n    BK-012317-UUID-VSP 1:\n      type: com.att.d2.resource.vf.Bk012317UuidVsp\n      metadata: {invariantUUID: daeccf0e-d5f0-4b95-98db-0ae23b890d1a, UUID: bd533689-28e0-4601-81d2-545a424a665e,\n        customizationUUID: 14a2c39f-e261-4453-8d09-28f1e006dc91, version: \'1.0\', name: BK-012317-UUID-VSP,\n        description: BK-012317-UUID-VSP, type: VF, category: Network L2-3, subcategory: Gateway}\n      properties:\n        ppd_name_0: {get_input: bk012317uuidvsp1_ppd_name_0}\n        oam_protected_net_id: {get_input: bk012317uuidvsp1_oam_protected_net_id}\n  groups:\n    bk012317uuidvsp1..Bk012317UuidVsp..pcrf_nimbus_oam..module-5:\n      type: com.att.d2.groups.VfModule\n      metadata: {vfModuleModelName: Bk012317UuidVsp..pcrf_nimbus_oam..module-5, vfModuleModelInvariantUUID: 96cf1eea-8bea-40f1-8daf-29b4d9e24139,\n        vfModuleModelUUID: 9dd06cea-7cef-4b3d-ba2d-4e84336a5654, vfModuleModelVersion: \'1\',\n        vfModuleModelCustomizationUUID: fd3104b5-c3bf-4080-81dd-78944dc8a263}\n      properties: {min_vf_module_instances: 0, vf_module_label: pcrf_nimbus_oam, max_vf_module_instances: null,\n        vf_module_type: Expansion, vf_module_description: null, volume_group: true,\n        initial_count: 0}\n    bk012317uuidvsp1..Bk012317UuidVsp..pcrf_base_template_v3_0..module-0:\n      type: com.att.d2.groups.VfModule\n      metadata: {vfModuleModelName: Bk012317UuidVsp..pcrf_base_template_v3_0..module-0,\n        vfModuleModelInvariantUUID: 85f5f4e4-b5e0-4ece-a3aa-bc5c68287700, vfModuleModelUUID: fa4033e7-9c3f-4140-a374-e80a742f6b2f,\n        vfModuleModelVersion: \'1\', vfModuleModelCustomizationUUID: 430443ea-78a2-43f5-8aae-967857ea4466}\n      properties: {min_vf_module_instances: 1, vf_module_label: pcrf_base_template_v3_0,\n        max_vf_module_instances: 1, vf_module_type: Base, vf_module_description: null,\n        volume_group: false, initial_count: 1}\n    bk012317uuidvsp1..Bk012317UuidVsp..pcrf_nimbus_pcm..module-4:\n      type: com.att.d2.groups.VfModule\n      metadata: {vfModuleModelName: Bk012317UuidVsp..pcrf_nimbus_pcm..module-4, vfModuleModelInvariantUUID: d47db54d-8146-4e24-bc88-5ca62ceda22f,\n        vfModuleModelUUID: 3fcb381a-860b-43e0-84e7-00774f43a5d8, vfModuleModelVersion: \'1\',\n        vfModuleModelCustomizationUUID: 2a1d55c3-df91-4a3c-afea-683a69fd4d8a}\n      properties: {min_vf_module_instances: 0, vf_module_label: pcrf_nimbus_pcm, max_vf_module_instances: null,\n        vf_module_type: Expansion, vf_module_description: null, initial_count: 0,\n        volume_group: true}\n    bk012317uuidvsp1..Bk012317UuidVsp..pcrf_nimbus_ppd..module-3:\n      type: com.att.d2.groups.VfModule\n      metadata: {vfModuleModelName: Bk012317UuidVsp..pcrf_nimbus_ppd..module-3, vfModuleModelInvariantUUID: 72e9eff2-d1c7-4dcb-8ffc-43afedb65e53,\n        vfModuleModelUUID: b509d8dc-7cb0-4139-ab85-5d764cd17bb5, vfModuleModelVersion: \'1\',\n        vfModuleModelCustomizationUUID: 9f14ae6b-b156-4b33-ad23-77aa3d9d38ac}\n      properties: {min_vf_module_instances: 0, vf_module_label: pcrf_nimbus_ppd, max_vf_module_instances: null,\n        vf_module_type: Expansion, vf_module_description: null, initial_count: 0,\n        volume_group: false}\n    bk012317uuidvsp1..Bk012317UuidVsp..pcrf_nimbus_psm..module-1:\n      type: com.att.d2.groups.VfModule\n      metadata: {vfModuleModelName: Bk012317UuidVsp..pcrf_nimbus_psm..module-1, vfModuleModelInvariantUUID: 07abb9e0-0714-4b9c-b269-b52a405ab4b3,\n        vfModuleModelUUID: 2b66c94f-3de3-45be-ad65-109d3c016bb0, vfModuleModelVersion: \'1\',\n        vfModuleModelCustomizationUUID: 357384b3-9085-42a1-b3ba-ec9baf9a9de1}\n      properties: {min_vf_module_instances: 0, vf_module_label: pcrf_nimbus_psm, max_vf_module_instances: null,\n        vf_module_type: Expansion, vf_module_description: null, volume_group: false,\n        initial_count: 0}\n    bk012317uuidvsp1..Bk012317UuidVsp..pcrf_nimbus_pps..module-2:\n      type: com.att.d2.groups.VfModule\n      metadata: {vfModuleModelName: Bk012317UuidVsp..pcrf_nimbus_pps..module-2, vfModuleModelInvariantUUID: 1d7dbc30-ac35-4120-b5ea-a4fe5b570de3,\n        vfModuleModelUUID: 18e1160f-f917-446e-954c-3ed3e8d5b13d, vfModuleModelVersion: \'1\',\n        vfModuleModelCustomizationUUID: f37780a8-e662-4b17-a0e9-ba798667be00}\n      properties: {min_vf_module_instances: 0, vf_module_label: pcrf_nimbus_pps, max_vf_module_instances: null,\n        vf_module_type: Expansion, vf_module_description: null, volume_group: false,\n        initial_count: 0}\n  substitution_mappings:\n    node_type: com.att.d2.service.Bk012317UuidService\n    capabilities:\n      BK-012317-UUID-VSP 1.disk.read.bytes.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of reads, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.read.bytes.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.latency:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average disk latency, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: ms, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.latency, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.vcpus:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of virtual CPUs allocated to the instance,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: vcpu, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: vcpus, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.scalable:\n        type: tosca.capabilities.Scalable\n        occurrences: [1, UNBOUNDED]\n        properties:\n          max_instances: {type: integer, default: 1, required: false}\n          min_instances: {type: integer, default: 1, required: false}\n          default_instances: {type: integer, required: false}\n      BK-012317-UUID-VSP 1.instance:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Existence of instance, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: instance, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: instance, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.memory:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Volume of RAM allocated to the instance,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: MB, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: memory, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.write.requests.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of write requests, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: request/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.write.requests.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.feature:\n        type: tosca.capabilities.Node\n        occurrences: [1, UNBOUNDED]\n      BK-012317-UUID-VSP 1.disk.write.requests:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of write requests, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: request, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.write.requests, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.device.iops:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average disk iops per device, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: count/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.iops, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.device.latency:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average disk latency per device, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: ms, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.latency, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.ephemeral.size:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Size of ephemeral disk, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: GB, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.ephemeral.size, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.device.usage:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: The physical size in bytes of the image container on the host per device,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.usage, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.write.bytes:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Volume of writes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.write.bytes, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.host:\n        type: tosca.capabilities.Container\n        occurrences: [1, UNBOUNDED]\n        valid_source_types: [tosca.nodes.SoftwareComponent]\n        properties:\n          num_cpus: {type: integer, required: false}\n          disk_size: {type: scalar-unit.size, required: false}\n          cpu_frequency: {type: scalar-unit.frequency, required: false}\n          mem_size: {type: scalar-unit.size, required: false}\n      BK-012317-UUID-VSP 1.disk.allocation:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: The amount of disk occupied by the instance on the host machine,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.allocation, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.network.incoming.packets.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of incoming packets, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: packet/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.incoming.packets.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.network.outgoing.packets.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of outgoing packets, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: packet/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.outgoing.packets.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.device.capacity:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: The amount of disk per device that the instance can see,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.capacity, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.attachment:\n        type: tosca.capabilities.Attachment\n        occurrences: [0, UNBOUNDED]\n      BK-012317-UUID-VSP 1.network.outgoing.bytes:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of outgoing bytes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.outgoing.bytes, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.device.write.requests.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of write requests, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: request/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.write.requests.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.network.incoming.bytes.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of incoming bytes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.incoming.bytes.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.memory.resident:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Volume of RAM used by the instance on the physical machine,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: MB, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: memory.resident, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.network.outgoing.bytes.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of outgoing bytes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.outgoing.bytes.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.device.read.bytes.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of reads, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.read.bytes.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.cpu:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: CPU time used, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: ns, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: cpu, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.write.bytes.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of writes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.write.bytes.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.iops:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average disk iops, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: count/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.iops, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.network.outpoing.packets:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of outgoing packets, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: packet, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.outpoing.packets, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.device.write.bytes.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of writes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.write.bytes.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.binding:\n        type: tosca.capabilities.network.Bindable\n        occurrences: [0, UNBOUNDED]\n        valid_source_types: [com.att.d2.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface]\n      BK-012317-UUID-VSP 1.cpu_util:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average CPU utilization, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: \'%\', description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: cpu_util, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.capacity:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: The amount of disk that the instance can see,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.capacity, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.device.read.requests:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of read requests, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: request, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.read.requests, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.endpoint:\n        type: tosca.capabilities.Endpoint.Admin\n        occurrences: [1, UNBOUNDED]\n        properties:\n          port_name: {type: string, required: false}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          secure: {type: boolean, default: true, required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.device.read.bytes:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Volume of reads, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.read.bytes, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.device.allocation:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: The amount of disk per device occupied by the instance on the host machine,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.allocation, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.root.size:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Size of root disk, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: GB, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.root.size, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.usage:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: The physical size in bytes of the image container on the host,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.usage, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.cpu.delta:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: CPU time used since previous datapoint,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Delta, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: ns, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: cpu.delta, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.device.read.requests.rate:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Average rate of read requests, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: request/s, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.read.requests.rate, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.os:\n        type: tosca.capabilities.OperatingSystem\n        occurrences: [1, UNBOUNDED]\n        properties:\n          type: {type: string, required: false}\n          distribution: {type: string, required: false}\n          version: {type: version, required: false}\n          architecture: {type: string, required: false}\n      BK-012317-UUID-VSP 1.network.incoming.packets:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of incoming packets, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: packet, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.incoming.packets, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.memory.usage:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Volume of RAM used by the instance from the amount of its allocated memory,\n            description: Description of the metric, required: false}\n          type: {type: string, default: Gauge, description: \'Type of the metric value,\n              for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: MB, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: memory.usage, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.read.requests:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of read requests, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: request, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.read.requests, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.device.write.bytes:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Volume of writes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.write.bytes, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.link:\n        type: tosca.capabilities.network.Linkable\n        occurrences: [0, UNBOUNDED]\n      BK-012317-UUID-VSP 1.disk.device.write.requests:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of write requests, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: request, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.device.write.requests, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: disk, description: \'Category of the metric,\n              for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.network.incoming.bytes:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Number of incoming bytes, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: network.incoming.bytes, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: network, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n      BK-012317-UUID-VSP 1.disk.read.bytes:\n        type: com.att.d2.capabilities.metric.Ceilometer\n        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.\n        occurrences: [1, UNBOUNDED]\n        properties:\n          initiator: {type: string, default: source, required: false}\n          network_name: {type: string, default: PRIVATE, required: false}\n          description: {type: string, default: Volume of reads, description: Description of the metric,\n            required: false}\n          type: {type: string, default: Cumulative, description: \'Type of the metric\n              value, for an example, Cumulative, Delta, Gauge and etc.\', required: true}\n          secure: {type: boolean, default: false, required: false}\n          ports:\n            type: map\n            required: false\n            entry_schema: {type: PortSpec}\n          port_name: {type: string, required: false}\n          unit: {type: string, default: B, description: Unit of the metric value,\n            required: true}\n          protocol: {type: string, default: tcp, required: false}\n          port: {type: PortDef, required: false}\n          name: {type: string, default: disk.read.bytes, description: Ceilometer metric type name to monitor. (The name ceilometer is using),\n            required: true}\n          category: {type: string, default: compute, description: \'Category of the\n              metric, for an example, compute, disk, network, storage and etc.\', required: false}\n          url_path: {type: string, required: false}\n    requirements:\n      BK-012317-UUID-VSP 1.dependency:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Node\n        node: tosca.nodes.Root\n        relationship: tosca.relationships.DependsOn\n      BK-012317-UUID-VSP 1.local_storage:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Attachment\n        node: tosca.nodes.BlockStorage\n        relationship: tosca.relationships.AttachesTo\n      BK-012317-UUID-VSP 1.link:\n        occurrences: [1, 1]\n        capability: tosca.capabilities.network.Linkable\n        relationship: tosca.relationships.network.LinksTo\n      BK-012317-UUID-VSP 1.port:\n        occurrences: [0, UNBOUNDED]\n        capability: tosca.capabilities.Attachment\n        node: com.att.d2.resource.cp.nodes.heat.network.neutron.Port\n        relationship: com.att.d2.relationships.AttachesTo\ntosca_definitions_version: tosca_simple_yaml_1_0\n','083b57cd-4b76-4924-a64c-610445528063',NULL,'BK-012317-UUID-Service','BK-012317-UUID-Service','Service','Network L1-3','N','Bk012317UuidService','service-Bk012317UuidService-template.yml',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('0b72b486-91cb-4734-a72d-d2a43f25771c','null','28286960-3f83-4c37-b40b-8915d8582ee3',NULL,'vFW 2018-06-04 16:17:40','catalog service description','Service','Network L1-3','Y','Vfw2018060416:17:40','service-Vfw20180604161740-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('11018d47-e8d8-42f6-8162-a691be055e18','null','e4f07ad9-155e-437b-88d4-b7b8d8a4e078',NULL,'vCPE 2018-06-05 02:53:1','catalog service description','Service','Network L1-3','Y','Vcpe2018060502:53:1','service-Vcpe2018060502531-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('1207105c-c1fc-4b2b-a94d-ac56522b70fb','null','66bbfebb-c97a-4841-b0ff-fbede0e905b4',NULL,'vLB 2018-06-05 02:37:19','catalog service description','Service','Network L1-3','Y','Vlb2018060502:37:19','service-Vlb20180605023719-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('12eb33fa-b221-4d87-939c-d808b5799a7c','null','ead151e2-e18a-44fc-b6ac-3ae3d819dcd6',NULL,'vcpesvc_vbng_0412a','bng','Service','Network L1-3','Y','VcpesvcVbng0412a','service-VcpesvcVbng0412a-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('16b0f456-4ddd-4b0e-ad4f-7783224043dc','null','620b7ab3-423b-4a39-8c98-e78fba42d178',NULL,'vFW 2018-06-05 02:43:09','catalog service description','Service','Network L1-3','Y','Vfw2018060502:43:09','service-Vfw20180605024309-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('1794adc8-2481-4ca7-9d5d-b3d3be9c686e','null','bc690cb9-8fec-4eef-a98e-580bdfed1ed6',NULL,'vcpesvc_rescust_0529a','vcpe res cust','Service','Network L1-3','Y','VcpesvcRescust0529a','service-VcpesvcRescust0529a-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('1af22bad-a297-448b-9f5c-ce6ca843f8ee','null','750ac797-4f08-4334-8d34-100ae2b59907',NULL,'vFW 2018-06-04 16:43:30','catalog service description','Service','Network L1-3','Y','Vfw2018060416:43:30','service-Vfw20180604164330-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('20040dc7-65ec-414b-a77a-f7c1f935b5ae','null','5351da04-b415-4a6e-877a-3e879ec01178',NULL,'vVG 2018-05-31 20:36:27','catalog service description','Service','Network L1-3','Y','Vvg2018053120:36:27','service-Vvg20180531203627-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('27a090ca-7a20-46c4-9698-eb1dae25bddb','null','d0bd924e-6d96-4ac8-a036-a6354f7d7e34',NULL,'vFW 2018-06-04 21:54:41','catalog service description','Service','Network L1-3','Y','Vfw2018060421:54:41','service-Vfw20180604215441-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('28681887-d259-46b1-8259-152b86dd1252','null','7cb9ddad-9597-4165-8dd1-04421368ffcf',NULL,'vVG 2018-06-05 02:48:17','catalog service description','Service','Network L1-3','Y','Vvg2018060502:48:17','service-Vvg20180605024817-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('2a6ee979-d07b-4ace-89d3-eda308283a12','null','b173f7ba-e618-44d9-b179-962b0e33578e',NULL,'vFWCL 2018-06-01 16:30:','catalog service description','Service','Network L1-3','Y','Vfwcl2018060116:30:','service-Vfwcl201806011630-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('3cd128f5-75c1-497f-97cd-fbc8f0c2e711','null','c811b5ef-8512-4cd6-b8ab-90e31e73c833',NULL,'vIMSService20180608a','143124','Service','VoIP Call Control','Y','Vimsservice20180608a','service-Vimsservice20180608a-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('52174fb4-be73-4f23-b706-a574d48022a8','null','40be5e3d-1185-4bed-b8ea-26cd65a461aa',NULL,'vIMSService20180607','dafdasfsa','Service','VoIP Call Control','Y','Vimsservice20180607','service-Vimsservice20180607-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('6b586613-4e3f-4bc7-b0b5-2a7408d9d6a6','null','5afd7dd4-d2e5-4fb3-a8c0-75cce1a225ab',NULL,'vcpesb7','hello','Service','Network L1-3','Y','Vcpesb7','service-Vcpesb7-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('6f691fb7-e38c-4256-81d2-bf5c8c1e3ba5','null','7a43a399-2134-45b3-b610-a9bfcc136c32',NULL,'vIMSService20180608','11111','Service','Network L4+','Y','Vimsservice20180608','service-Vimsservice20180608-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('8686e9e2-6790-464a-a746-efd37b809c17','null','056a5391-2f6b-4c0f-b4ee-593641a52a9e',NULL,'vFWCL 2018-06-01 18:23:','catalog service description','Service','Network L1-3','Y','Vfwcl2018060118:23:','service-Vfwcl201806011823-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('87665c89-2b6d-4d35-ba74-d477c0cafbeb','null','c12550e2-8a33-4924-a612-7fac61778a42',NULL,'vLB 2018-06-01 16:15:38','catalog service description','Service','Network L1-3','Y','Vlb2018060116:15:38','service-Vlb20180601161538-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('87fba18b-c8dc-4a3f-b578-dd79354eb9f1','null','90dbea8d-3a8c-4135-8d24-e054d5f5da05',NULL,'vFW 2018-06-05 02:33:36','catalog service description','Service','Network L1-3','Y','Vfw2018060502:33:36','service-Vfw20180605023336-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('8cf77de9-06a2-429b-b7db-cf3f4d122a46','null','3f7c1350-5233-48e0-a2aa-00c1038469f5',NULL,'vcpeservice','hello','Service','Network L1-3','Y','Vcpeservice','service-Vcpeservice-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('8d6335d8-3883-483d-9e45-fdcd9e11c351','null','93008484-8d5e-41b2-9e29-6c86ac2d0b36',NULL,'vcpe7service','hello','Service','Network L1-3','Y','Vcpe7service','service-Vcpe7service-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('8dde7703-773d-4e2f-9f15-896ddac78be0','null','6011136e-597f-4f7a-8d43-f9827383d146',NULL,'vFW 2018-06-05 02:25:46','catalog service description','Service','Network L1-3','Y','Vfw2018060502:25:46','service-Vfw20180605022546-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('8f8e5a56-eec8-4a16-b866-0c934323a006','null','86e96538-cb4d-4975-8af3-ed075d3f52fa',NULL,'vLoadBalancerMS','vLBMS','Service','Network L4+','Y','Vloadbalancerms','service-Vloadbalancerms-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('a64f918a-7028-4760-a0dc-521c66ae56fa','null','057961dd-b436-41d2-86e1-ded5e4c335e8',NULL,'vLB 2018-05-31 20:26:41','catalog service description','Service','Network L1-3','Y','Vlb2018053120:26:41','service-Vlb20180531202641-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('aa8812f9-06bd-4c26-8099-9a98d0229f19','null','670c4959-3cfa-43c6-b8b7-5998fa20d116',NULL,'vcpesvc_vbrg_0412a','vbrg','Service','Network L1-3','Y','VcpesvcVbrg0412a','service-VcpesvcVbrg0412a-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('abd7a199-c445-4324-b57c-3b2af348273c','null','ce6cc49e-ea8d-4b90-9cc3-444c7f8d5550',NULL,'vFirewall','vFW','Service','Network L4+','Y','Vfirewall','service-Vfirewall-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('adcbcc7a-6685-4b78-9b4c-61e49e15bf45','null','963bda29-af3f-4f2c-8650-3ee4a39606e0',NULL,'vVG 2018-05-31 20:19:12','catalog service description','Service','Network L1-3','Y','Vvg2018053120:19:12','service-Vvg20180531201912-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('afdb3920-b9be-4626-910b-f5c1a2ab5eb4','null','54a49baf-c7f6-4838-a3a4-9c25a96be2fc',NULL,'vFWCL 2018-05-31 20:22:','catalog service description','Service','Network L1-3','Y','Vfwcl2018053120:22:','service-Vfwcl201805312022-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('b1cc4717-cfdb-428c-a93b-a7d8c746e706','null','fb17d0c1-2189-471a-aabb-75380361daff',NULL,'vVG 2018-06-01 14:05:20','catalog service description','Service','Network L1-3','Y','Vvg2018060114:05:20','service-Vvg20180601140520-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('b241ec41-d98d-4a03-a54c-b52791a9c3cb','null','a3ebfaf2-3dea-43b0-bb8e-566f95735230',NULL,'vcpesvc_rescust_0412a','rescust service','Service','Network L1-3','Y','VcpesvcRescust0412a','service-VcpesvcRescust0412a-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('b321ed9e-1bd5-4271-a8f0-ee663b820cfc','null','dd97264b-4115-480d-ac76-a9e15fe19936',NULL,'vIMSServcie20180608b','dafdsaf','Service','VoIP Call Control','Y','Vimsservcie20180608b','service-Vimsservcie20180608b-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('b47f8de0-860f-4202-bfdc-5cf3659092b7','null','9793a762-266f-4a79-87ca-df9f720ecb87',NULL,'firewall3','hello','Service','Network L4+','Y','Firewall3','service-Firewall3-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('b4c3eac7-9f57-4330-9a05-c7d5595505ea','null','655e15b6-1821-46d0-8c56-6b24d9afca31',NULL,'vcpesvc_vgmux_0412a','gmux','Service','Network L1-3','Y','VcpesvcVgmux0412a','service-VcpesvcVgmux0412a-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('bc2e2de4-25dc-4dd3-a67d-f96412045492','null','84e95ace-4674-405c-b228-6cd550ff8ac6',NULL,'vcpeservice9','demo','Service','Network L1-3','Y','Vcpeservice9','service-Vcpeservice9-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('c4080e72-8db8-47b1-87ac-479d37062265','null','84c2fcfe-3629-4e64-a80f-1b13135dbe44',NULL,'vLB 2018-06-01 13:55:12','catalog service description','Service','Network L1-3','Y','Vlb2018060113:55:12','service-Vlb20180601135512-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('d891d858-c805-4fc2-b38c-ebda6c1c9a7b','null','af88c762-2776-4164-881d-6cf0f2cd2360',NULL,'vVG 2018-06-01 16:25:09','catalog service description','Service','Network L1-3','Y','Vvg2018060116:25:09','service-Vvg20180601162509-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('dbeed4a7-1536-4110-8e6a-2dc1e57f9c26','null','3b373ae2-b14c-4468-986b-78284ec952bc',NULL,'vFWCL 2018-05-31 20:42:','catalog service description','Service','Network L1-3','Y','Vfwcl2018053120:42:','service-Vfwcl201805312042-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('e4e7ae06-5a32-4278-b0ff-282ac0952910','null','4cadc250-9bda-49b4-9c4e-7baedf9b88d3',NULL,'vcpeservice2','good service','Service','Network L1-3','Y','Vcpeservice2','service-Vcpeservice2-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('e523f567-8bfd-4e7b-b9e4-07d466272166','null','08a5a162-bf25-40a6-b3a2-3537afd83ed0',NULL,'vFW 2018-06-04 17:32:02','catalog service description','Service','Network L1-3','Y','Vfw2018060417:32:02','service-Vfw20180604173202-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('e6e82074-e7c0-4096-82e5-46114f6116de','null','f6fbc972-04ed-4958-a5d2-84c1c5e0b66b',NULL,'vFWCL 2018-06-01 14:11:','catalog service description','Service','Network L1-3','Y','Vfwcl2018060114:11:','service-Vfwcl201806011411-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('f0d19319-a926-4f5c-bf63-06d417c8f3ab','null','dc729baa-c5a1-4ed0-89b9-3af55cf201ff',NULL,'vcpesvc_infra_0412a','infra','Service','Network L1-3','Y','VcpesvcInfra0412a','service-VcpesvcInfra0412a-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('f3bb7dfa-824a-4034-8760-0bc7dc8a9530','null','dec3f43d-ffb1-4367-9827-9183801fdba9',NULL,'vLB 2018-05-31 20:16:23','catalog service description','Service','Network L1-3','Y','Vlb2018053120:16:23','service-Vlb20180531201623-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('f84b3649-6e42-4ff3-8550-4f7dff594ba0','null','1cd28fd6-7b62-4378-8a41-187fc0ea5c6f',NULL,'vcpegoodservice','hello','Service','Network L1-3','Y','Vcpegoodservice','service-Vcpegoodservice-csar.csar',NULL);
-INSERT INTO `SERVICE_MODEL` VALUES ('f943d194-9cba-4d4a-9cb9-8b88737f7cbc','null','03b65058-d396-4ce9-8eda-b0d8875e2394',NULL,'vFW 2018-06-04 16:26:42','catalog service description','Service','Network L1-3','Y','Vfw2018060416:26:42','service-Vfw20180604162642-csar.csar',NULL);
-/*!40000 ALTER TABLE `SERVICE_MODEL` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Dumping data for table `VFC_MODEL`
---
-
-LOCK TABLES `VFC_MODEL` WRITE;
-/*!40000 ALTER TABLE `VFC_MODEL` DISABLE KEYS */;
-INSERT INTO `VFC_MODEL` VALUES ('0062f5d9-eee4-4660-b08b-b1c63500b6ec','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0063a07b-6eb7-4ed0-a0fd-5a2877cf1b11','null','629e5ac3-c75d-475f-8262-f53f6f761c2f','dec80f28-f12d-4ade-be99-d3ebf7635ecd','1.0',NULL,NULL,NULL,'virc_cc','virc_cc','virc_cc',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('00b2ed93-e2c8-468b-aa39-bd77a2f3e4ac','null','aa2c90ad-56a3-417e-bfac-a16d52855861','a053db31-b6e6-4268-9d64-f3f26f630671','1.0',NULL,NULL,NULL,'schemamanager','schemamanager','schemamanager',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0137c30b-93c3-49cd-ac2b-eff8eeaae0c9','null','48ecf111-2b9a-491b-9a25-55fb39117ea0','ef7ad35d-0f5f-4016-900a-51ed005ca693','1.0',NULL,NULL,NULL,'cognosccm','cognosccm','cognosccm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0142d2b6-d79d-459e-a414-4a68e18d554c','null','d8e95546-60f7-4d74-9bc3-97326e57f9bf','d003593a-de80-4202-9a80-bc5338c679c4','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'nd.c4r8d0',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('014a9370-210a-491e-badb-2831f7ebc6d1','null','c9b52c32-2e53-47f5-9250-650d5380764f','33befda2-c9fc-4b49-9202-393fb8130277','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('01984773-9b8c-4a9e-ac78-7a6715abea41','null','94a6c3d9-fda8-435a-9e77-4eff0258b7d6','117022fd-d404-4d61-8d33-9fe539702eed','1.0',NULL,NULL,NULL,'nems_be','nems_be','nems_be',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('019ee7d6-97f0-41c1-a9c8-ce753223c258','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('01eb2ef8-2331-4a95-bfe1-d3e4dad3cd4f','null','81edb46d-046e-4011-81b4-35abe397885f','cfea6434-95f5-4de2-9823-4615e00f1aba','1.0',NULL,NULL,NULL,'plt','plt','plt',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('023fcd99-b707-4084-81f2-5bc4c58a62fc','null','481942e9-104e-4def-95f8-6666d7c1ea69','6050698d-2c49-4476-af74-e36f9ba3e436','1.0',NULL,'Y',NULL,'vgw','vgw','vgw','vgw-base-ubuntu-16-04','m1.medium',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('037cd524-4b26-4609-8fd0-3aa61ed1a2e2','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('03993dc2-e8ae-4b48-a5d9-33811fe820dc','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('03a5b04e-ebb1-4d2e-bc69-d4f88706086b','null','dd05c4b4-e316-4dfe-8299-e80171bf48b8','9fa396db-273d-4fc2-90f7-05462023c744','1.0',NULL,NULL,NULL,'be','be','be',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('03ac3cb1-60fc-4ae1-bd5a-68c478bf6a8e','null','3c0d2220-739d-4696-90e3-5ffd283c2b02','3d4e2721-6f89-4bf2-89d7-64ed08942465','1.0',NULL,'Y',NULL,'ellis','ellis','ellis',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('04080672-2d81-4f9d-a58f-78d4380d9a18','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0447d25b-a3e3-4c51-809b-81a55b052bd4','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0448c405-43f6-4514-8ce7-57f46ec47f55','null','7d603e14-9f59-4948-964d-df8bbccdc467','04d01856-ae41-487a-9919-b309a95309ae','1.0',NULL,'Y',NULL,'app','app','app','USP_IECF-APP_30.3.3-mcas4.4.6.qcow2','nd.c12r4d50',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0471e477-09c1-43e2-a26a-7839d81475ee','null','1f00292a-0da3-4862-82c2-a606f9e2bf9a','ffa107f2-20ea-4264-8aa0-34a4dcd9e33c','1.0',NULL,NULL,NULL,'its','its','its',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0533df13-256d-4aa5-8123-3ed4cd067a00','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0540f0aa-408e-414e-a00f-f5fc603edaef','null','9cef0352-fbe0-47df-87d5-62ed44ba5608','d2990b48-bc98-492f-b5cc-963db16b5ee9','1.0',NULL,NULL,NULL,'pd','pd','pd',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0561ec40-601c-41bb-bce5-04feae250e09','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('05d29ec2-ac26-4b6f-9687-9898c6c18910','null','facde21f-6dfe-47d1-beb5-003fae6a0651','462efc3d-a1ca-4925-a982-1dbd8d3dfbaa','1.0',NULL,'Y',NULL,'msrp_msc_b','msrp_msc_b','msrp_msc_b',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('05d36951-3d07-4255-8058-5bfc65b62d38','null','1ba0abe4-897c-4d22-a039-b6af2fea476b','f00fb687-7cdf-4fe7-aaf9-3836c793ffaa','1.0',NULL,NULL,NULL,'sm','sm','sm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('05fda582-6802-4e21-ba32-610c7fb1d1b8','null','55372be2-6074-4793-92b1-e0fe1afb08b7','d03e16a8-becc-435b-aacd-829f6e3150b3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('063ed102-0d00-4cff-8bff-880ed09ad584','null','5fb94500-7c25-4e41-86e3-87e11738a997','67079eb1-9fe6-4731-955c-e737ac75be56','1.0',NULL,NULL,NULL,'rpmrepository','rpmrepository','rpmrepository',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('069ef0e7-87d0-439e-846f-097c5d64a94d','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('06a1d072-4752-48c8-9c52-dfdd4c09c9e1','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('06eb1491-11fb-4e2c-80ed-5f4ad8b83b18','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('06f49ac5-7025-4737-bc0d-880371539b49','null','0a288050-1f71-4ccf-8661-316720483150','8ef01225-7484-4d8c-bd31-b7d45c4c8bec','1.0',NULL,NULL,NULL,'qtracelb','qtracelb','qtracelb',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('071a1959-8203-4e9d-8c2f-d3dd67076353','null','1acc9e6a-8984-4cc5-8d72-3bfb793ed325','83fd2e6e-3c8f-478f-a940-0bf3913d2cf6','1.0',NULL,NULL,NULL,NULL,'vdbe_node','vdbe_node',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('078e0007-2e68-4472-9506-d5910e167fa2','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('079379c5-41fa-4acb-b058-dd762213f48c','null','d8ae042a-d48f-4d1c-963f-b928f9c5dded','b4ac350f-d421-4d7e-a45f-44f0b3dde082','1.0',NULL,NULL,NULL,'mmsc','mmsc','mmsc',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('07be8d64-8e5a-4de6-96e7-41782560df6a','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('08372faa-bc18-4211-9fd3-19e3841ddc94','null','e886bdeb-5486-4ecf-ad03-56837ab6e550','5e749085-6671-4472-a068-e9a974324c2a','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('08559203-1f1e-4424-ac5f-6ec24bb8bf6d','null','c4930be0-706b-4d8a-b062-6e5b4dd2af84','0b6648c5-027c-4e26-98da-59bb62d30a23','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0863ccbd-cfdf-4f71-b8ef-e37a045aef7b','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('08f086e2-a710-42e1-944d-ac8fa4118040','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('08f2b087-4b49-41ff-b4f5-a36c6d2cd92e','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0a2882a0-eb50-4c05-a99b-97b6f4308620','null','6af6139f-fdad-4b92-a60c-1e121b05bcaf','8c85080c-5e9a-44ab-9a50-e2f7347abaec','1.0',NULL,'Y',NULL,'uir','uir','uir',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0a941339-667f-49b7-bf71-58f952cecbb8','null','cfc8c02a-5018-4b58-8216-87dd38c72bfa','edd9bea9-efe1-4c15-a415-f7ddc83d4bd1','1.0',NULL,NULL,NULL,'ps','ps','ps',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0abe9a8d-2437-4d82-92e5-d8190a8e2240','null','8dd6d443-245e-4836-b008-cffdd1ed7f92','9db9362c-0fbd-4621-ab74-6571903dcd8a','1.0',NULL,'Y',NULL,'app','app','app','USP_IECF-APP_30.3.3-mcas4.4.6.qcow2','nd.c12r4d50',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0b221466-3962-42cd-b241-e08093869999','null','313d829f-d955-4489-8beb-d46dfd8a458d','2f2bac38-753a-46c7-a4e2-6b781a84c3a4','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0b390d3f-7089-45c9-8726-c69bdb7ee963','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','852c4237-cfdd-4695-9e75-bcd4cf7d38a3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0b552ace-2f72-4d78-8adc-3f6e7032dcf2','null','6e0975ad-7f9a-4dfb-b4b9-0bc7f42dc8b2','0f294f57-03d6-4348-83ae-4ede8f9430ec','1.0',NULL,NULL,NULL,'processing','processing','processing',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0bc31a69-5e59-492c-a40b-e954d98b0809','null','51a669a5-4c83-4231-8aa0-9939acf835ef','3b97c83c-ee8b-4eb7-9910-428b7a58d9cb','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0bc7260b-0572-4a47-bd84-b7bdb549a64c','null','47efe716-c94d-4d1e-9739-d90a0110f62a','418c85aa-4f64-4cad-a106-c22bcee7316e','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0cd419ed-508f-4dc6-bcd7-a18787161255','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0d5f6296-2725-4ddf-a5f5-4ec2b2bfa2fe','null','6f46fe0c-e467-413f-98c6-45aef5b7e33f','5a0d5695-bd83-423d-b9a2-c241528ecb89','1.0',NULL,'Y',NULL,'adm','adm','adm','{}','nv.c12r32d320s32',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0d9e290a-d6ad-4211-a11d-18b4792297f9','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0dd132b5-f92e-4171-98ab-f22fb7695ba0','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0f284f86-fddf-49c3-9a33-bf0ede0a361d','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0f34a065-f043-401f-b0ef-d33dd77eb1e4','null','788edb40-2174-4722-8756-9c61b20484ec','e98433e9-6ca5-436d-aa17-4d7385ed99ec','1.0',NULL,NULL,NULL,'rdn','rdn','rdn',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0f4ca5e1-0f10-4550-a815-4f1a7ce05c32','null','feb4bb3b-accc-4396-8649-0898f4863d33','203caf20-132f-406b-95b0-ef8a35112dcc','1.0',NULL,NULL,NULL,'pcm','pcm','pcm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0f61f955-e80d-43a4-8ce1-b74193595e95','null','e33903e2-7bc2-4393-b185-87f5907539f2','47157d39-6286-4037-88e5-2f616ff751bf','1.0',NULL,'Y',NULL,'pcm','pcm','pcm','NIMBUS_PCRF_11.0.0Base-ATTM1.0.0.qcow2','nv.c8r12d100',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('0f6f72f5-c86c-4b79-988b-4c0b5f18ce9a','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1','yaml','inv-uuid','fe6985cd-ea33-3346-ac12-ab1214812345','version','policy','Y',NULL,'naming-code-1','vm-type-1','vm-type-tag-1',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('10dc2bc5-8ab4-4477-930c-c6796781efd3','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1139adfd-89e7-4f25-95a3-1c600ff48e59','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('113b3b51-2d7d-4c1c-bffd-cef0a2c56035','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('11955383-eca3-4375-b8ee-07897373db19','null','0a83b10f-8eea-498a-83f3-7df8780a8f68','8a74fa52-ab11-414a-92e2-5908d72f405a','1.0',NULL,NULL,NULL,'app','app','app',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('119ec191-89dc-492c-a713-fb45f5364cbb','null','99fe50cc-cadf-403f-a959-f481234a167c','2f95d643-f250-422a-9dcc-1b3c3f732525','1.0',NULL,'Y',NULL,'fe','fe','fe',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('11e735ff-de23-4a31-8e8c-c8af0cc37ed9','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('11e7e845-7975-4e03-9eb1-b61c8a37f361','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1203cf96-76de-4325-bb58-0053f1c6ddb1','null','2ec4feac-d67a-4b9f-b95a-f9f65e3ad4e3','b875f1c3-0308-4f32-b87c-856d19293f96','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('12375bce-022c-4842-9321-dfedcf42a359','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('12b65d89-eaf3-4353-9810-d9d0848539e0','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('12cee19b-3c7e-4a61-9c3e-123702c6a2f5','null','46ab3cd7-6880-416d-b8e3-a9f3fbf197cb','b246c2ea-905a-4707-b191-29c752b76a5e','1.0',NULL,'Y',NULL,'vdns','vdns','vdns','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('130faa79-9b52-456c-b21c-ad45c8bb9db4','null','18f47678-e346-4149-96fb-ebe50cda4f04','63cd6a88-45fc-4da0-b118-91641b9a2a9c','1.0',NULL,NULL,NULL,'TEST_server','TEST_server','TEST_server',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('134626fe-118d-426a-82d3-fb0619fbc475','null','74cb4bec-db68-4888-9c40-5e26776541ef','c1ce217b-343f-4d43-a7b3-95ac392aced0','1.0',NULL,NULL,NULL,'cm','cm','cm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('13e3d5d9-dcf2-4a8d-bb66-5a2ea61f79ba','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('13ec94e1-b04c-4fd1-99e6-c982020e453f','null','c4e5fb37-2a68-4687-9f4d-939b6501fea3','acb904f1-c258-4e78-8d27-850c995d9fa3','1.0',NULL,'Y',NULL,'vfw','vfw','vfw','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('142e0921-694a-473e-b5b6-b974a4b5b0d2','null','39fca8db-3cde-4c23-b61a-508c4d0641fd','23fd690c-ceac-4847-b61d-a4621ea834ad','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('14fdd90f-1dfc-4227-9c88-28e1ed111b34','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('153c72a6-3ad3-410e-b0e9-b2b6a4ffa66f','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('156f559f-0e61-4940-a0d4-d45639833b9d','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('157fccbd-2462-4370-bbb4-786c9b2e0815','null','3ca34c00-47ad-407b-8b31-d209843f7a07','a6a47256-5dad-44bb-afd3-a3dcb58b6493','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('15a549ee-36fa-4775-9d22-e12cafb1cc22','null','936ae33b-9cbc-429f-8517-6c540f884fef','19236636-177c-4ae5-b8bb-fcd5a29fefa5','1.0',NULL,NULL,NULL,'app','app','app',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('16412ab7-109f-4c1f-beec-8a447255290d','null','f596ba90-dab9-4be9-8002-e8ecd3906d5f','ab087889-fb19-4973-bb9e-2fd1c25be0b1','1.0',NULL,NULL,NULL,'cognos','cognos','cognos',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1669c0c1-40ec-48dd-825e-ec50916968f0','null','2bad24a8-c657-4b83-9418-86f2384b9b8e','dac6007d-c20b-46ed-8d7d-fa8fab319e4e','1.0',NULL,NULL,NULL,'its','its','its',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('168fe2e1-4cd2-4d4a-b647-2045d10b878b','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('16b581a8-30b8-4cf2-a199-70e0b1311c18','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('16b9c577-9176-4df4-8e74-39fce3c4ae92','null','a334ea62-22d3-4b33-8cc0-c84b77344a30','8e01babb-d2c8-4e4d-bd63-e139c3549599','1.0',NULL,'Y',NULL,'ldap','ldap','ldap',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('16e20667-0700-4aa2-882d-cebdbe650ef1','null','5a315346-8d3e-4a2a-b4ff-a466fe54366e','d1c62b46-7a23-49aa-81c1-574694a4f33e','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('16f679a4-35c3-4485-9ede-4042dfe1c201','null','0cb480f6-dfbd-4af2-84b0-52b212694070','ec33342f-14ce-45b6-96d2-ac4403ade6f9','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1782c476-7f94-4c01-9921-02459a6ce3cb','null','fa8bd3a6-bfc2-4c0f-b8c4-a21fc121e18a','cfe2bb58-8c31-4395-b632-ad82f3f24c3f','1.0',NULL,'Y',NULL,'vlb','vlb','vlb','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('17bd986c-d4ac-42dd-9618-0073427967a1','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('17d5c405-cfcb-4abc-96e4-a0e6fce100cb','null','f1217a3a-8fcc-46bd-a331-c120e9044260','0016a9b9-436a-4969-a629-78b379bad2c3','1.0',NULL,'Y',NULL,'dns','dns','dns',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('17e57524-24b7-4e8e-8425-3ebe49a04ca8','null','e886bdeb-5486-4ecf-ad03-56837ab6e550','5e749085-6671-4472-a068-e9a974324c2a','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('18981d0b-5d2c-4021-b7d3-a81f8beaa830','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('18ca2316-4d64-4295-8797-cc7599c0be17','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('195f76ea-8256-4a07-b525-b40267c37b21','null','1b48a3d5-9f28-4e02-80d9-14fccc9908f3','333d1cc0-954d-40b2-a4ab-a1cc74c3f3c7','1.0',NULL,'Y',NULL,'vsn','vsn','vsn','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('19f675fc-c648-4a7f-94d9-f24fcb47bdc9','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1a4909ab-73ee-4088-8cf6-45a99d076991','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1b8c9fc6-be3c-4570-81da-97e76a7bafbb','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1bf49c1e-80a7-4039-877b-79da95053258','null','473fb54b-ed67-4725-b7e3-674e96c55649','37f1531b-a288-4c49-8c02-3ff17212c89e','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1c0632cf-4a76-4b17-9194-b294dc1ed460','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1d63438f-8683-481d-af5c-8a440ff6c86e','null','2ee82e43-6879-4dbd-b720-4feae04a788c','c1b4c88d-e538-4c18-a712-19832db42ed7','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1dd16655-f74c-4484-ada0-656484588424','null','e886bdeb-5486-4ecf-ad03-56837ab6e550','5e749085-6671-4472-a068-e9a974324c2a','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1ddb4d75-211c-418e-a50b-cd7242ecaa19','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1dfcaa44-2b6f-407c-aa6f-89d12c850a13','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1e262dce-063f-464a-87d6-f7d82910a1c7','null','5818d233-caf4-4825-a7bb-144bbd731329','b8c28cad-e97a-4ee8-bc64-119b373cf98f','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1e3d921e-1df6-4bfa-9a94-939586fc9843','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1f57716e-b0a0-4e25-bf81-7b8c9c1a2593','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1fc2d7f5-036f-4a77-b840-83277e76f13c','null','6a8ef342-f873-4fa6-87fc-c8315cf1e670','8ff1df7f-8c97-40fa-9f86-a4a40e0b5e3f','1.0',NULL,'Y',NULL,'vsn','vsn','vsn','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1fc481ad-15cc-4bff-8e32-d4c59bd4e2e6','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','7f26a2f8-3e6f-463d-8d7d-2a8fc36b2935','11.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('1fdb9130-1cf4-4c50-b72c-3379e4cf0efe','null','bfc3b33b-6bac-49ef-8d48-f732937bb75c','3d9006dc-21b9-4ce8-924c-053757611565','1.0',NULL,'Y',NULL,'msrp_msc_a','msrp_msc_a','msrp_msc_a',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2','yaml','inv-uuid','fe6985cd-ea33-3346-ac12-ab1214812345','version','policy','Y',NULL,'naming-code-1','vm-type-1','vm-type-tag-1',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('20111295-e578-4039-9adb-5a8443a8a86c','null','8a8a0fb6-8a01-492c-b131-a6894f41cc74','f57ee0f6-6f98-4ec9-8b04-b03fe0bf6f21','1.0',NULL,NULL,NULL,'sm','sm','sm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('202e7744-8c3c-4915-b654-15488c602bd9','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('20449785-a2f2-4c89-858f-b22a27835136','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('20a556fe-312a-41ab-9a03-374063d23aea','null','89fe5872-8061-42f6-a707-6bb8323e3055','a24dd75f-2b9d-447c-aa9a-76e2c1e9a6fd','1.0',NULL,'Y',NULL,'sprout','sprout','sprout',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('20b7262a-15c4-4644-8ebe-7921d6c18123','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('20bd05dc-f26b-49c7-8738-f4109b1177d4','null','1b9d7f98-60f9-476a-bd30-dc200fa89f93','0318d0e9-d938-4c4a-9157-848e5564f717','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('21352862-eb18-4867-8ea2-d524f2f98647','null','d37e1483-cec0-4311-9601-ada3bf5bedea','2cada292-0bc6-428a-af64-7ec0d28faf02','1.0',NULL,'Y',NULL,'bono','bono','bono',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2153c384-b814-4630-8756-e1477228dcb4','null','779329c0-9056-4e55-a2bc-4512268f462e','cd30fe8f-6a81-4b02-89c9-38f463a58e3d','1.0',NULL,NULL,NULL,'fe','fe','fe',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('22245ea3-605f-4a9f-94b9-cf39ef7f3c0e','null','2f21b65a-7513-4bf9-895a-6ed159057121','04ada531-a377-4488-b8b2-76da20fee49d','1.0',NULL,'Y',NULL,'vlb','vlb','vlb','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2262746d-fac4-490f-8866-a540a6058cbf','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2296b1d8-a70c-479e-b8b8-b8a7de9ef44b','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('22c63259-70c3-4d19-8f75-47ebef517be4','null','6993657c-6ea7-4554-90ab-9cc4b01fe929','347947f2-eec7-42e5-9b2c-46ae2fa38ccf','1.0',NULL,'Y',NULL,'vfw','vfw','vfw','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('22d1c351-6d11-4184-81ac-af81d4de101c','null','2b60f774-37ee-4121-b28a-8883b20a0fb8','f028b735-c52b-42a7-ad34-bc51d14037ad','1.0',NULL,NULL,NULL,'d2ice','d2ice','d2ice',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('23b0fda7-3008-41df-a3c0-b25dd54a3f77','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('240d4bc3-8350-4882-abc6-efa6d477fbff','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2435ffd0-cf02-4c82-a6df-655986b2518b','null','25160afc-3d87-461e-9bcb-5c87cdd14858','7434e326-25bd-461f-b5b7-2be901a9dfe7','1.0',NULL,'Y',NULL,'vaaa','vaaa','vaaa','ubuntu-16-04-cloud-amd64','m1.medium',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('244632dd-0eaf-481e-ac16-3c6952434b7b','null','af6d9190-974e-4227-86df-ffd517887f61','f69d1c42-f423-4e8d-90c8-afee2f435651','1.0',NULL,NULL,NULL,'TEST_server','TEST_server','TEST_server',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2461f70b-edaa-487d-8bab-1646c4f24515','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('25011296-744f-4cf6-80ed-476758829e90','null','5d9c5b7e-bab1-4409-921e-333ecc9f76a1','ad09505d-a09d-47f7-8612-4852046b6ae5','1.0',NULL,'Y',NULL,'vweb','vweb','vweb','ubuntu-16-04-cloud-amd64','m1.medium',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('256c73d2-1aaf-49fb-82a9-c5236f139e9c','null','e2a1695a-4738-45a1-95fb-6b9876d72989','64eb97fe-401b-44b1-94c6-890e017ba2f9','1.0',NULL,'Y',NULL,'app','app','app','USP_IECF-APP_30.3.3-mcas4.4.6.qcow2','nd.c12r4d50',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('25d3be48-fc4b-453f-96de-97e07e6c18f5','null','8a496682-3285-41a1-9a6a-35da76bfeecd','24dae213-c503-495a-8086-0c4377d5ca70','1.0',NULL,'Y',NULL,'vfw','vfw','vfw','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('25d55f9e-a84c-49d7-89cf-7a8c8eea8bae','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('260143db-a9ff-4415-bfb0-c35a7b7063af','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('262cbb0f-c6d4-4cf0-9281-1f53c8ffdbc3','null','4f452541-6af0-42b1-b297-c8f308475a56','dc573479-521a-4ad5-8b6f-8c13b87fc091','1.0',NULL,NULL,NULL,NULL,'vdbe_node','vdbe_node',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('267d9b14-e8e3-4fcc-9cbd-da3d1b6ae843','null','27606886-b4ec-48c2-8a55-ba7e551b6b4b','2ff33bb7-c53e-4829-a7b9-4c698f2d464c','1.0',NULL,'Y',NULL,'vfw','vfw','vfw','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('269a1dc1-96f2-4b0b-a8d6-0b322cd1f7b0','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('26c479ff-a252-4510-950c-e8ec996e4f0c','null','16646ff5-a6e1-4ffe-b865-0b60d651a858','823ab43d-b194-43f8-8b02-2146f4b6092e','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('27bdc15a-5ed4-4529-97ee-0c1960e5528c','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('27f4e949-3263-45d3-a592-20eb8492556c','null','8e15b51a-5e4d-48bb-8c09-d7a8949ca333','89678cef-a1b3-4844-beba-4b2c4a34e132','1.0',NULL,NULL,NULL,'qloader','qloader','qloader',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('27fde274-45f9-499d-9d7e-7a9196c680b2','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('281f4841-4a67-40a8-ba1d-c1971f82ffb7','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('284c3ef2-99b1-45c8-a5f7-14e33ee08676','null','a8f2f314-d7a8-41f3-9752-a6b22fb15a57','e49cf9e1-a63a-4f9d-9825-06c2661bd33c','1.0',NULL,NULL,NULL,'pd','pd','pd',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('28ed6793-760d-4b33-bf48-367adcbe26fa','null','51eec557-e371-4af9-b6ab-d09e7ca5d904','13cf44eb-7dae-48e5-bbee-e8b3bf26e9ef','1.0',NULL,NULL,NULL,'oam','oam','oam',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('28ff8b3e-486a-4f15-bcd8-5bab711d5c33','null','00c0b60a-689d-4840-87d8-4c23ea4656a0','9cf253eb-b103-422c-a432-f1ee3f7538c3','1.0',NULL,'Y',NULL,'vsn','vsn','vsn','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('299426a1-ece5-4fbe-b449-2cfaa1788c98','null','fd2c7c18-aa25-43c6-940d-f496d8e0d3d8','be447d18-0340-4f9c-937f-d742dc8b961e','1.0',NULL,NULL,NULL,'pd_server','pd_server','pd_server',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('29f53689-0d3d-431b-99cc-57fc002f5baf','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2a811181-e613-4ec8-95d2-893d4007cbb9','null','1f3512c6-94f4-4609-905e-267e95addf83','4696c1b5-3781-4413-b3b0-14082a51da0b','1.0',NULL,NULL,NULL,'its','its','its',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2b44c9db-28e1-45aa-b297-a4511d5317fe','null','8d111ea9-21e7-46ed-84cc-8cd1f6f5c0f6','99abdfab-fecf-4332-a080-7889760e3cdc','1.0',NULL,'Y',NULL,'vdns','vdns','vdns','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2b480094-9d68-4a65-966d-af1d89349143','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2b4c6ecd-2423-41ec-a8ff-ee4ecc05670d','null','915c8ffc-c334-49b2-938a-0d8a6e85f3b0','da4f670c-9a6e-425a-9d0a-791953e8664b','1.0',NULL,'Y',NULL,'vweb','vweb','vweb','PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)','PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2ba8635a-b069-4787-910a-9b57043244ab','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2c4cb9db-c093-4c7c-ad3d-fae4ffa17486','null','17ee4aa2-cc4d-48d9-8cf0-4680ce60ee76','f5a2ab55-33a0-4a91-8315-cf3e44aeaf00','1.0',NULL,'Y',NULL,'bono','bono','bono',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2c5c862d-8e31-4559-bf66-4a396e847b2b','null','4363ec32-ac12-46b5-a681-da39c9b937ab','071040aa-79e1-4451-b0f5-582e8e59efda','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2dce2d53-9cd0-40c8-87c7-4318165c4016','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2deb1937-f627-42ea-97d7-ea6df8f525c1','null','e886bdeb-5486-4ecf-ad03-56837ab6e550','5e749085-6671-4472-a068-e9a974324c2a','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2e708833-1f3d-4653-a0bc-5328b73bbbf6','null','0cb480f6-dfbd-4af2-84b0-52b212694070','ec33342f-14ce-45b6-96d2-ac4403ade6f9','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2ea04d4a-84ce-4641-a879-544477584f72','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2ea978ac-2761-424b-af1f-c0707ccdbfb1','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2f381c15-0fe9-4c88-99b7-5e2f165a38db','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2f6e792a-63b3-45a4-b9ae-cc38b4301bb2','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('2fc889a4-d5a0-46b9-a502-6411db0c4a1c','null','f2c4a5c4-d809-4d19-9c02-308b34e89794','65d44361-202b-4aeb-bf5d-ba318fc1f34d','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('30145f1d-140a-452b-95c9-0530a5ece13d','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3018cfbc-fa08-4dbb-b2a1-195267d79b1e','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('303059e0-a0b5-463d-8e96-5c85ff0cfc46','null','686d2704-0892-41aa-8b79-b7360fe6903e','e4ac3c72-2437-48fd-907b-6418b691f798','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('30969396-fa5a-4faf-9163-db6484e54e59','null','f8248051-b29b-424d-b87d-6df6d1a23ab8','73a85ed6-0b6b-4ae2-be9b-3efc011650e3','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('30c35db4-9682-4f55-92d4-142079dbc5a1','null','10421357-a2b3-4a7a-b82d-125b2805fa5a','56324cee-8dfd-48f3-aae8-3101be93cdac','1.0',NULL,'Y',NULL,'adm','adm','adm','{}','nv.c12r32d320s32',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('30c7d426-fd01-4ab1-9a87-3c53bcd23d88','null','05814c22-d7bb-4d14-93ba-d2079f2666e7','84bb300f-48cd-461d-82a8-f24b0e54cb3f','1.0',NULL,NULL,NULL,'iox','iox','iox',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('312a26bc-b721-4ed5-a402-be0e502c675b','null','8d5acbcc-77b0-43ee-9775-8f4cd8fdf949','b50b4639-baf7-4472-9acc-fb576bc007e1','1.0',NULL,'Y',NULL,'xsa','xsa','xsa',NULL,'nd.c4r8d0',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('31608b19-4efc-4620-a248-61147f9ec8a9','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('31b53e81-28c3-482e-842c-0ebd21053b59','null','84e0b247-cb3e-42d5-abe8-a8b43ba2236b','a75552e8-3868-41ab-bbca-12ed6bbf62e0','1.0',NULL,'Y',NULL,'vsn','vsn','vsn','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('32365da5-1a59-424d-8397-4fbce1bae4fa','null','dd03d850-e91b-4ed0-bde4-0e721e76d013','1ee5d912-91db-46cc-9735-0b14d9463f7f','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('32b1b5a1-e05d-447d-a5ff-9c247bfdbc72','null','d94bdc77-144f-4b50-a351-aea5cbc9de4f','d81064dc-bf74-44c5-afcc-e17916a915d1','1.0',NULL,NULL,NULL,'cm','cm','cm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('32e76c6c-5676-4ce2-96df-e8b8adde7d42','null','daceed99-fb22-4518-b962-f7582a83f899','f2de251f-55cb-44de-ae59-febaf171201f','1.0',NULL,'Y',NULL,'sprout','sprout','sprout',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3303c8ea-2e16-4a3f-96b7-fa98132560e6','null','196c64ee-ec75-445f-990e-08c6c9635298','16da0427-b36f-40ea-bb63-a68bf9a84272','1.0',NULL,NULL,NULL,'oam','oam','oam',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('332fff76-b67a-4970-82e9-4e6db5fc0e36','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('334add61-2118-4e75-8db3-5674849b5320','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('33d693e1-61cc-4517-9eec-56fb0572c93f','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('348e928a-e3d1-4faa-ac35-a1e2d6768fee','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('356e5394-90ca-4dfc-8ade-529077b727e4','null','55372be2-6074-4793-92b1-e0fe1afb08b7','d03e16a8-becc-435b-aacd-829f6e3150b3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('35726559-7135-405b-9691-47ed50bcbc19','null','55ef56c6-5f0b-420e-a787-64944a746d89','99e3482a-d42a-4ffe-aeb7-9e9ada03c8e7','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('358b84ab-f1af-4c42-8c81-c92801eff167','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('36102a1b-ce2c-46b9-967f-30318db23a32','null','0d54acdb-fefc-4d60-a429-ef351dc2a1f5','a10ddd8c-4366-4394-8854-6bf7b0d0014b','1.0',NULL,NULL,NULL,'oam','oam','oam',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3665d859-180a-4314-beac-8f1877f2697e','null','9645e0f8-e537-4f9d-b137-8d16251f7138','4ff38825-5106-43de-971b-90b46d2e4e26','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('36eea4ac-8f88-4323-942d-7446fbf9639a','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('372ee369-1d49-4aa2-acc0-1ef806a4fc03','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('376d659d-528d-41f7-be51-39ef57834ec8','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('377825eb-e83d-49b6-81ce-c99a0d30064e','null','c5e5ae98-7ad9-4a05-ad58-18329ff34ec9','50b3a4f1-928a-4736-95b5-7b040d4a631d','1.0',NULL,'Y',NULL,'vsn','vsn','vsn','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3794aacd-6535-41c8-af1c-02e300ccf50b','null','9c9a8369-9e89-431b-9e73-9d483b2cf7e4','8d2e734d-882e-4998-9c8b-413e2b9d1241','0.1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('37e7c1c1-d886-47e1-90a8-f907fcb312c3','null','849f2d15-7a03-4a2f-b408-275afe6f890b','ce4c3d39-a19b-4dd1-b7ae-9985cb39fcc4','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3827c05b-6c06-42c8-8725-b95353f97d9d','null','27c16c65-2ecb-4c7f-bda2-96aeb31e5ae0','8e7dcc7d-9aab-4509-b3c9-81ef4cdb2ea5','1.0',NULL,'Y',NULL,'iox','iox','iox','USP_IECF-IO_30.3.3-mcas4.4.6.qcow2','nd.c4r4d50',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3850fdff-11a8-40b8-8bc5-f589c42a6702','null','60b620de-1ff3-46d3-9ae9-672b47ef0b27','75b70257-ee09-4481-965c-f3397849623c','1.0',NULL,'Y',NULL,'vmxvre','vmxvre','vmxvre',NULL,'ns.c1r16d32.v5',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('38f47dc0-dc33-4375-98a9-0a9d37c9ad4c','null','ce213aac-bfac-462f-804e-a33091598aad','d65d9977-6053-4fba-b75f-a2fa315cd9b8','1.0',NULL,'Y',NULL,'mmn','mmn','mmn',NULL,'{}',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3982125d-dfc4-487f-862f-66e1e7f78d17','null','b3bf2d8e-a28c-43a8-9d68-a08a39502faf','38b82ce2-7b45-4f4b-bb2c-bdaec51fc8a5','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3a05ede5-360a-4f5a-8cad-072560dd4406','null','1451a853-2fc7-4858-b1b4-72fe23395a6b','4a920796-cb97-4bd4-8724-c2e6155a86e4','1.0',NULL,NULL,NULL,'app','app','app',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3aba87d2-cc84-44fd-bc43-190d750f1e69','null','55372be2-6074-4793-92b1-e0fe1afb08b7','d03e16a8-becc-435b-aacd-829f6e3150b3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3b08d0cb-3f1c-4178-8dab-bf7b85782f00','null','09f0165f-9d58-461d-a297-fbb3988f47ee','73486661-ca17-4cd1-a1d9-114ad4174341','1.0',NULL,'Y',NULL,'vfw','vfw','vfw','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3b1b59a6-d272-4ece-9dfb-ca87f0f793cc','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3bb96b94-bc38-47ef-8202-f4c1f4b27beb','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','852c4237-cfdd-4695-9e75-bcd4cf7d38a3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3bca6d26-d1c1-4ec1-9bb0-92ac6ec98dc0','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','7f26a2f8-3e6f-463d-8d7d-2a8fc36b2935','11.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3c0ebca7-bfe3-4a8e-8167-93a7878c9bef','null','07e7ca7e-fca2-4131-a73e-51884ac6f4a6','6618af0c-d1e5-4813-ba39-228f2ad99128','1.0',NULL,NULL,NULL,'ps','ps','ps',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3cdfd81c-3bb5-424a-af61-ae38a0131317','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3ce98db0-0653-4d31-b065-a61a1959ac5f','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3ce99b7c-9515-48fe-bb98-62f22f2fb005','null','5ec38b95-96cd-4cb1-b90a-484f4b13bd1a','c1374c40-adeb-4371-9d71-209c0315aef8','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3d1957d7-1eb4-4df6-8469-74bccd0bd11e','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3d370a1a-2529-4c8b-be72-e4bf088c8e8a','null','e6645581-0cc6-4e7d-a4dc-42124c8e364c','4b91bd36-feea-4a40-8304-609285032caa','1.0',NULL,NULL,NULL,'rdn','rdn','rdn',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3d8d3b5d-9c34-415b-8c74-7f0a9c7bda51','null','ced31a1e-b4ad-4fbf-aefc-1a3701f16bc4','b302fc76-1708-4ef9-a217-231620ab4154','1.0',NULL,NULL,NULL,'nems_fe','nems_fe','nems_fe',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3e3471fb-6ca1-49a2-abe6-40e7a864f767','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3e37923b-b8cb-498c-938f-a19449908f52','null','bb8ff02b-6404-4e81-96e7-33999ed0fff3','62c39097-93b8-4d9b-9fa2-6c3e0d36d729','1.0',NULL,NULL,NULL,'pd','pd','pd',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3f777214-6a28-459c-962d-8ae02f45da94','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('3fe28b6e-6631-463e-8044-5062f2ab133c','null','39b2008a-1fd8-4af5-90cd-5bf098bd1123','ad7c0ec9-fddf-42d6-8c21-999a83ea0eb5','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('40183eae-faec-4e45-bfd2-c16565cbc034','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('40821124-8d95-4f55-91e2-608e72ffe6d6','null','21d87e48-2aa9-4f8d-9daf-268b31363a31','35a3e997-8208-4040-a4b3-0a6d39e198cd','1.0',NULL,NULL,NULL,'mmsc','mmsc','mmsc',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('40a486a0-8420-4d2e-b2b9-fdd5d757f60c','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('41185191-dbed-4382-a9ae-f0e847fec9ff','null','83429bf9-49f1-4187-a5ad-afc329a84e76','ce422e74-7e58-4464-8a54-61e21f3ca7e5','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('416b75a7-32ea-458c-95fe-c14854d618ca','null','2cd8a808-e1e6-4d28-b6e4-fc29094f26b1','06223028-84b2-4b8e-b579-9ecffa9d66f0','1.0',NULL,'Y',NULL,'vsn','vsn','vsn','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('41d27492-bfe6-4588-8f7f-d280636b667e','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('41e0211b-d990-4d09-845b-b98c9bed3f07','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('41fb28aa-44f9-48ee-9bb2-d4db999ea4b6','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4209ff94-bb09-4a7e-a8cd-ef7691d20faa','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4258c5c9-19f8-4942-a820-db7a646d9310','null','c5eaa410-5dcb-481e-88a4-44434fc9c58c','c3b635e7-4bcb-4537-b1c2-edc9ca45ac3b','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('428b0e01-a072-4d21-924e-2f692fec7277','null','7a1a7790-bbcd-4aa3-9c84-345ca1c4b52b','ffcfccb9-8813-4d8a-9f29-a6cb4dd4e754','1.0',NULL,'Y',NULL,'plt','plt','plt','USP_IECF-PILOT_30.3.3-mcas4.4.6.qcow2','nd.c2r4d50',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('42ab4b8a-5046-4b5b-bfff-8503dc43f257','null','1dde5066-ec47-470d-ac78-f741f61885ec','0ec3151a-dab9-48ae-89e8-f1a88b73fbf6','1.0',NULL,NULL,NULL,'its','its','its',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('431f242c-8b94-4f4e-873b-6546f1ed60a1','null','f2d2ffde-5ed8-44ae-9471-f8bc0a51a89f','0b882f5f-b364-4603-85b5-e8cc94a11fe0','1.0',NULL,NULL,NULL,'be','be','be',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('437d3bd7-2fff-4642-8a87-5396aa90128b','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4440906c-a7e7-478b-a637-812999219fd1','null','a2a4b5bb-4e1e-4eaa-b5df-ce972afb1566','ab437c3e-7fb6-45e5-b8cd-f1af9fae9ac2','1.0',NULL,'Y',NULL,'vgw','vgw','vgw','PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)','PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('449e1e81-848e-45f7-a1f0-14aa9bde238b','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('457d2c5f-1899-43b0-85b3-caf5866a6065','null','eaba5eb8-c480-47dc-b046-9ac6fc886077','aa524dcd-f38a-4f07-8288-af7cb10569d7','1.0',NULL,NULL,NULL,'its','its','its',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('466c9e3c-6a64-4ae8-8900-07dd5f2f1473','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4682caca-c19b-4f1e-a8c2-b68ac4fc9c5f','null','5a315346-8d3e-4a2a-b4ff-a466fe54366e','d1c62b46-7a23-49aa-81c1-574694a4f33e','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('46e79c61-9476-43b3-b1ee-7b39c8569531','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('46e86198-aec6-4036-b38e-c1cbd3e7e349','null','223edb5e-cdb3-4a32-97d0-46bb57c99ad7','bf3c23e2-0ee4-4e4a-a7c5-e0e6b6625706','1.0',NULL,NULL,NULL,'pps','pps','pps',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4795998e-8cd5-4b8f-ada9-fe9488392da8','null','dce46f0a-e270-4779-90f3-83857c9f8798','3595004d-f5e3-435d-a8f4-5f1cbb5b1aee','1.0',NULL,'Y',NULL,'vfw','vfw','vfw','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4858ced6-3fe9-4803-91ee-a10a69239496','null','16ecac80-118e-4826-bc18-9bd527126b7e','b3e8dc25-ba0e-4ba6-b301-b66a05043040','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('48687b06-df68-4180-a0b8-bafda155ea4c','null','2e5549f2-9d83-4916-9fd8-fc0acf7c8a33','80b6e3e8-1193-4fee-ba25-c20c01517d63','1.0',NULL,'Y',NULL,'ralf','ralf','ralf',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('48e19b0c-73d4-43c1-8172-a603cc6a0a27','null','d2fea408-a0ac-4074-8ff1-3ca271aa981e','814192e9-ff9a-4d44-914f-b0cc37fca163','1.0',NULL,'Y',NULL,'homestead','homestead','homestead',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('48e45c5d-e7b0-4dfb-9d40-40d122ad1c44','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('49036c1a-217e-405d-bf5e-08c9a46d57d7','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('493be6dd-c307-4d84-bee4-2ed50e044f54','null','069f2359-0ddc-4aa5-b240-25ee8ea545c9','d901e0a6-31b7-47d5-8648-e78881c54c48','1.0',NULL,'Y',NULL,'vbrgemu','vbrgemu','vbrgemu','PUT THE IMAGE NAME HERE (Ubuntu 1604 or vbrg-base-ubuntu-16-04 SUGGESTED)','PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('49414e75-93e9-4f8f-bc79-49b6655bd4e5','null','230bf8f6-f204-450a-af6d-9cc65fea4f76','7c19492b-dc31-4319-8213-7b9ff791d314','1.0',NULL,NULL,NULL,'rdn','rdn','rdn',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4aa42ecd-6cb4-4759-8fd3-6c2fae4a2034','null','179a86ce-e6b0-463c-bd4b-03595729976a','f18ee363-2b6f-4408-8a93-1dd8ab5ffb42','1.0','nfc.naming.policy.robin',NULL,NULL,'nfc.naming.code.robin','ps','ps',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4b922450-c9a6-4533-9d24-92f1b1f84160','null','80ebc47e-1f35-4ab8-a36d-2328a4a6985b','d6a00b1f-e12c-4145-9842-0ef6fc4fd69a','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4c0e88fe-b367-46c2-ad07-fe7a8cde6f30','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4c6c958d-b1b4-4aef-a768-0618a5650527','null','583301de-2a2e-40cf-98bb-3018be595871','26eaff4c-c6e0-41ee-b02e-27cc1208ed73','1.0',NULL,NULL,NULL,'configurationrepository','configurationrepository','configurationrepository',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4cedb213-a6ed-443e-8f8e-67cef4c87e47','null','58ce4658-3fcb-4b6d-a04e-43655908f50c','732be459-eaa5-4263-923e-21d46599740b','1.0',NULL,'Y',NULL,'ssc_b','ssc_b','ssc_b',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4dfadd90-d618-4c8d-b47d-60efebf6d01d','null','cb2ab141-3a2b-4ca8-9c5f-d19ff7a6bf5a','ebf0f8cd-8a8c-4348-bfaf-543238315697','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4e09e0f7-6b42-41f5-b197-2ecfd4877987','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4e7f65c4-94aa-4826-b401-c7f75d7a5e97','null','3bcaeab7-d987-4faa-abb6-0ca59f1ac661','4af66211-80b1-44b5-b68c-212c4921295f','1.0',NULL,NULL,NULL,'iox','iox','iox',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4eb18412-12f7-480f-b232-5a4c4cb2fade','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4f2f5f08-8a0b-4828-be27-5ff1a641ed6a','null','86f39736-fe98-410c-b0a1-12baf7a64626','369abd2c-c79a-4ee3-9152-a158a8e160a9','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('4fa2c6e8-bd95-4440-af00-390e8fffebc5','null','85bb6bc2-cd25-4bb2-98a4-28cc47d270cb','73717171-1684-4aea-acfd-7abc8533fec3','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('50432d50-169b-4592-93c7-7df340829872','null','88404161-33c8-4225-9b11-934b2686b005','f3264aab-8f59-4942-a118-2663e445e055','1.0',NULL,'Y','Dev2DevNfcFunction','pd_server','pd_server','pd_server',NULL,NULL,'Dev2DevHighAvailability','{ecomp_generated_naming=true}',1,10);
-INSERT INTO `VFC_MODEL` VALUES ('5051c268-7bb5-4d56-895f-8f829087025a','null','b95401c8-5c5e-48b7-9839-d581cfca5935','4c671c7b-3ce5-48d6-b7ca-4047c3ebb2ef','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('50f47cdf-1c8b-4843-b331-94927f239a6d','null','9c283f37-5516-427f-b230-37fc356852b6','95a81e90-cd52-4adb-a31a-957691fb11dc','1.0',NULL,NULL,NULL,'smp','smp','smp',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5130f20f-66c2-4ae5-8f93-bdb4ef857585','null','44874be0-cc1d-48de-aed3-d34b8be81ec4','d86fb88f-4dd9-413a-8f09-2c6638fd9b14','1.0',NULL,'Y',NULL,'vfw','vfw','vfw','PUT THE VM IMAGE NAME HERE','PUT THE VM FLAVOR NAME HERE',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5165ea8b-7460-4879-b6da-5a9bfc4380b8','null','be545d42-bfa1-45c3-8c74-2febed777c45','4c5e5e35-19a6-4551-935e-44c6a4468b1e','1.0',NULL,'Y',NULL,'vmxvpfe','vmxvpfe','vmxvpfe',NULL,'ns.c20r24d25pin.v5',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('518db694-1c7b-458c-abbe-b9676fdd68e0','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('51b414f7-8f44-42be-94bd-8e83c7bebb6e','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('51d4e18b-ee2b-4f40-8812-4904d310e500','null','4ddeea35-c041-472a-853b-40b8974dd9ca','140b8590-3d21-474c-9cd2-72d71eae93ac','1.0',NULL,'Y',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('521d3ae4-ad2a-4479-8b47-2b8e2f265a8b','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('527637d4-3f1b-4453-8a73-63be37d3ff3f','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5418661d-07e1-403a-8caf-03f5442f2308','null','bb073a19-69ce-42cb-9dad-9fd2f10869f9','ff8c866d-e5b7-406e-80fc-3767c4e095c9','1.0',NULL,'Y',NULL,'vaaa','vaaa','vaaa','PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)','PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('542331c9-6001-4760-a7d6-c2946a68e5aa','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('54325dd2-d646-4f36-bb61-c1657771bbef','null','51a669a5-4c83-4231-8aa0-9939acf835ef','3b97c83c-ee8b-4eb7-9910-428b7a58d9cb','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5453e348-8c2a-4ae1-9c78-13861de6ae4f','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('547126cc-f04f-458b-906a-ecb8463a058a','null','8d111ea9-21e7-46ed-84cc-8cd1f6f5c0f6','99abdfab-fecf-4332-a080-7889760e3cdc','1.0',NULL,'Y',NULL,'vdns','vdns','vdns','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('54b6166f-1926-4542-899c-fb4aa0a3254b','null','8a33e6d3-ba02-4004-a057-d8deefc6a217','1941965b-d36f-493c-90d9-cfe1085ac402','1.0',NULL,NULL,NULL,'ps','ps','ps',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('54d33de8-a3a3-48d4-9616-7976d894162a','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('54e94ecb-84f1-45d1-88a3-235e6a229ad3','null','55dc46be-b1e3-453b-acf8-2e104f92d5c0','f9bd14f0-a4eb-411f-b3d9-6599336dca01','1.0',NULL,'Y',NULL,'ellis','ellis','ellis',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('54e98abe-743a-400d-809c-095644d92dd9','null','e2a3b48a-a1a7-4993-b606-ce90436c2453','1da48e1e-d2d9-42cb-8aee-20761d3cb257','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5543defe-8d08-4cde-badb-fc68eade5100','null','e113d30a-8a62-492a-837f-735a4eb88db9','eb45f98e-31d1-4c8b-afca-7412defa9056','1.0',NULL,NULL,NULL,'pd','pd','pd',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('56079609-0b08-4307-8f61-2bb1545aed00','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('565090e4-6b5f-4690-8743-19cb7716fa8c','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('565a8a1c-4ccc-49cb-a3dc-5f8f8ce72c51','null','6b67203e-d718-4b4d-8fa5-3308b9d6d909','07ec6c1d-5336-403a-a41c-950cb68956f5','1.0',NULL,NULL,NULL,'prx','prx','prx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('56f74777-a946-46d2-8ceb-c7f0d124894c','null','c5f1a3b8-fd2a-4938-8ff3-734f6049d0b1','d522e5ca-5bb6-4e51-8ca6-99b59fd789ae','1.0',NULL,NULL,NULL,'iox','iox','iox',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5790fb74-2ac3-4340-b69a-08bf3f3d126b','null','1c2ec7cc-2558-40a9-a5de-23ccca42f2ed','2717a36a-1b5e-421b-8794-65c7a92763a1','1.0',NULL,NULL,NULL,'fe','fe','fe',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('57ce1650-9b4d-4a45-bee1-b4e841fadfbb','null','dec68ab1-24f5-4d83-a37b-80c716bb4c31','bf2cab5b-a968-48bd-b4bc-65914bba461d','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('582e18c1-689b-4516-9855-7fab1a489b18','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('58cf0015-fdca-4c3f-98bb-53c863716fd4','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('59330f0e-f45f-4111-bf21-a4bed5d4b30d','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('59698c21-7013-4e48-9f7c-bc6f9ea2562a','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('59817abe-bbed-4aeb-a1c1-5cb60b043543','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('59b22558-fa49-4c10-af6f-a38ba93fbc5c','null','72308d7a-5d2b-43d0-ab9d-1839fae15b63','f2c093f3-2f6d-46dd-880d-2831569cdaa9','1.0',NULL,'Y',NULL,'adm','adm','adm','{}','nv.c12r32d320s32',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('59cc25b6-e415-489e-aeab-e5edde982605','null','d1167766-829f-4022-8592-2b0edfb6069e','184c9f75-7577-4996-afbc-1ccc5419e015','1.0',NULL,NULL,NULL,'smp','smp','smp',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5a119889-9974-4a98-92d5-96a715f7c24a','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5a661196-c961-4286-9198-564347fea738','null','0d87f028-90dd-4b2d-8f76-87a4b4b55b64','d9d2dace-1ec5-496a-88f7-63dc218e1d99','1.0',NULL,NULL,NULL,'itc','itc','itc',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5a6c9ad0-e611-4ef7-92db-b40e420b1cb7','null','a181d0ff-11f8-4818-b98a-e14690db64cd','9baf379a-2c58-4788-9dcf-4a769dcd28a5','1.0',NULL,NULL,NULL,'oam','oam','oam',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5a81616f-3b85-47f9-b3a6-43ddc9d705d1','null','2b39f3e1-0dce-4786-9d9b-ec9613ce350c','96f733e6-9ed1-47e1-a77b-f1cabbecd142','1.0',NULL,'Y',NULL,'vdns','vdns','vdns','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5a953500-41c9-43a1-bdab-48321b482c79','null','c117b652-dc84-43b7-b30c-12b21891f47a','95d3013e-11b2-4bdf-97ba-6e4a5a7c4227','1.0',NULL,NULL,NULL,'ps','ps','ps',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5aefee46-a414-488f-b648-cd02afaa7b02','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5b3263c1-71f0-4dcc-815c-9ebdfcb40a7f','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5b453243-b3cc-4177-a218-c722216fa867','null','8cf7115b-cc5d-4143-b53b-96135982c0be','3aa0e405-eacf-4a54-b254-f95dd19a305b','1.0',NULL,NULL,NULL,'its','its','its',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5ce95a94-dbbc-4648-a7c3-deea7e7997aa','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5d160958-74af-4327-96d6-d4bebe5e0465','null','23bfbe35-8d8e-469e-8da5-9d17dddef5a9','27daf0ce-39f6-4e3a-ae3c-d92bb253aa45','1.0',NULL,'Y',NULL,'sbc_a','sbc_a','sbc_a',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5d2ec4aa-6e7f-4841-b67e-7b31a4e1858c','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5d9f98ca-8553-4dd0-98e8-a6fe6de2ec94','null','744574d4-1102-4955-8e71-9ac4ab301bbf','08c98244-6d94-4c3a-852f-b3d05e371df1','1.0',NULL,NULL,NULL,'plt','plt','plt',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5dc18cc5-64ee-4f43-ba4d-cc24a6305425','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5df465c0-9806-4790-8602-43ee2ffbf546','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5e482da4-33c4-4601-bae7-d4b05436e58a','null','e886bdeb-5486-4ecf-ad03-56837ab6e550','5e749085-6671-4472-a068-e9a974324c2a','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5e910229-fbc5-4347-910c-e293d63934f7','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5eb99594-a29e-4943-8820-fd63de08170d','null','10df99f3-77ae-4e5f-b80e-f7f151a62d0e','a3c9b528-7bcf-41b9-aecc-6c77073cbd99','1.0',NULL,'Y',NULL,'ralf','ralf','ralf',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5f309a70-35f3-4b2b-9f06-71c70b39f3a2','null','cdb897e2-b3e0-4365-91d9-a603527fb52c','50148aff-51a7-4251-879d-54dd039086ae','1.0',NULL,NULL,NULL,'ps','ps','ps',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5f6f8dd5-f078-4a8a-a596-8b18c81d4370','null','8d7b528f-ff3c-49d1-b56e-51ff3a826de5','94989b71-b412-4f3e-8823-27e9f9fb8ea9','1.0',NULL,'Y',NULL,'bono','bono','bono',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5f859628-9f96-48a4-a2d7-a97c1148990f','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5fd8bde5-aa4a-4e3e-a9e3-f874eddc00f0','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('5fdc1d98-154f-4d04-9d09-5fcb40b8c0e3','null','86093520-4a0a-4427-b1b7-1432a8ec0716','a8f3626b-bc8a-48fd-8c24-859943feed1c','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6006ec20-3a36-4b3f-ab75-a1fcfd5147ea','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('605ae21e-0b6d-4cd0-93cb-393313b4bbd4','null','c7d8fb73-f7c9-4dca-8c23-ddf11c84b8cb','ea5877e8-c188-4908-bc35-225bb4d4fb6c','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('60636dd9-1339-4711-b1bd-2c7de1e7791e','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('612f98b5-39cc-4cba-8424-d889d44c68cb','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','852c4237-cfdd-4695-9e75-bcd4cf7d38a3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6163e3b4-ad26-4b16-a3cd-d0f3a3c66214','null','a43132b6-23a3-457a-ad2b-0c2059ce06c0','e424e686-9ac7-4e68-b68c-ca7e546e427d','1.0',NULL,'Y',NULL,'vsn','vsn','vsn','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6167622f-b602-416a-9bed-c38b157726f8','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('61a24df6-cde4-4d83-ae28-ed1f60e85381','null','4a31d00f-a377-4273-b4a0-e862cb2ef56f','a36bb94e-b4b4-4ee1-a890-8a95d3c75f50','1.0',NULL,'Y',NULL,'vsn','vsn','vsn','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('61ac4ca1-9516-43c8-ab0e-d869e3d5d011','null','6a7dd5e5-40d7-4d13-a761-e1ef754456dc','704735f4-3289-437b-9d87-2b2ea1a06a1b','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('61c7a13d-8dbf-4ed8-b00b-728f48ffa8b7','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('625434ec-f721-4a37-a8cb-e0e901de4103','null','7ff1b44a-41d3-469f-baf2-7f102d47feba','1d4f0506-bace-4fa5-b38b-3c31ae5e857c','1.0',NULL,NULL,NULL,'pd','pd','pd',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('62d977c1-b230-49b3-8be1-4b5872f5e3df','null','629e5ac3-c75d-475f-8262-f53f6f761c2f','dec80f28-f12d-4ade-be99-d3ebf7635ecd','1.0',NULL,NULL,NULL,'virc_cc','virc_cc','virc_cc',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('63227786-48c6-4e70-a229-64a4dd79d8c4','null','e3bd0944-6f66-4b36-9baf-2e3492e4d1e1','4f473ee3-5ec3-4b9c-a615-6a942c4729d5','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('634b1226-63e1-4a84-b9a1-e68a1403efa9','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6383c740-0dc8-4937-8c0f-70d77fe2ee17','null','fd3d83d9-e375-4d27-ad44-99c84b5a5c26','eadafe4a-071c-4279-a898-d00d3dbda63d','1.0',NULL,'Y',NULL,'mts','mts','mts',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('63e225bc-c72e-42d0-95b4-9f9f77139c18','null','00db22fa-171a-42b1-8292-c6029717cdac','42d0b694-64d5-4846-8ee0-c7a1d1531d50','1.0',NULL,NULL,NULL,'oam','oam','oam',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('64088775-2a93-41a5-bb53-3206f9c36afd','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('64508b50-a134-41d4-a957-ba40718dc250','null','46ab3cd7-6880-416d-b8e3-a9f3fbf197cb','b246c2ea-905a-4707-b191-29c752b76a5e','1.0',NULL,'Y',NULL,'vdns','vdns','vdns','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('64fd6f6d-aa6d-40bd-a883-5b8960e0f64d','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('652259eb-1b57-4f6e-8d22-6420a8261938','null','8816c6b0-7b78-4485-b986-23b66b5bb73e','24c53a82-f4d7-40a7-a0a8-105be2bdd393','1.0',NULL,'Y',NULL,'vdhcp','vdhcp','vdhcp','PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)','PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6522a054-632b-419c-b88d-e56a1b5236ed','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('65794907-4255-48fa-b710-86a806e23e99','null','b051c80d-d816-4c2d-a208-61410c68f6e2','81905a04-15f8-4f7a-8a24-3848cf419ee0','1.0',NULL,NULL,NULL,'iox','iox','iox',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('65ade596-5f15-4115-a3a3-e214cc95a129','null','93b69c42-b5e8-44c6-a9ac-10ce60054dda','4659e19b-dec9-4ff7-a322-78ba480f1767','1.0',NULL,'Y',NULL,'ppd','ppd','ppd','NIMBUS_PCRF_11.0.0Base-ATTM1.0.0.qcow2','nv.c8r12d100',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('660e35c0-74cf-4c71-bc28-7bf9a769b5b9','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('661515a7-71eb-4b65-9a67-4c3fe8915404','null','d273feaf-7e39-45ab-8572-bf19f546b06b','f7001d42-6a1e-4ca6-a82c-b075f6981d93','1.0',NULL,NULL,NULL,'pd_server','pd_server','pd_server',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('66518250-5925-45ac-bcf4-086bb8656b66','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('667b77ee-a50b-4889-9c7d-46d8cb934a63','null','16646ff5-a6e1-4ffe-b865-0b60d651a858','823ab43d-b194-43f8-8b02-2146f4b6092e','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('66bc8dbf-26c6-4b12-9b87-c29b14cb1bac','null','989690d2-4811-44c0-8e0a-67d1a5097cba','2a23c13e-632d-49c3-8a0a-958e3d7dbe9a','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('67194296-d115-467b-99c2-bfd50d9e175f','null','d2c2c2ac-fbea-4a36-a8e6-96ec4906036e','d97a6a1c-7887-44ee-8188-aaa3a839462f','1.0',NULL,'Y',NULL,'homer','homer','homer',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6738c484-287c-4ecf-8095-0e38f0691482','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('677cf9d5-c18b-4fc5-a36c-4324dbcf3852','null','59f360ec-d2ba-4b27-aeb0-d35618afcb76','890f9c2c-828e-49e2-9c20-b2a77355149e','1.0',NULL,NULL,NULL,'sm','sm','sm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6784843b-6ee2-4ea9-9245-2a9400ab9288','null','c9945dc9-208e-48d3-a482-96925abe89e9','f2f35403-065e-489b-8b9a-c5c46dd76825','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('67a8fd2d-c4fc-4982-8680-7cceaad13cf6','null','f2051395-8c0c-4879-8256-955cba5e96ad','50c05360-95f8-40bb-bd10-d495f7d6dba5','1.0',NULL,'Y',NULL,'bono','bono','bono',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6835d254-f980-4d84-b997-f2437090fd3d','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('68386bcb-a633-4732-9777-7b997a448e5e','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('686bdd0b-788e-4744-9e7f-32869db281ce','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6873c4ae-14a8-4ecd-9c04-24e20eb2542c','null','117e6aac-885f-4ff8-891b-8e2696ce4964','1de8217a-db29-45e5-9f43-2edc6c9d85d2','1.0',NULL,'Y',NULL,'vmxvpfe','vmxvpfe','vmxvpfe',NULL,'ns.c20r16d25.v5',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('68d5f2b0-5ad7-488e-9803-43aeeab09759','null','e886bdeb-5486-4ecf-ad03-56837ab6e550','5e749085-6671-4472-a068-e9a974324c2a','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('694b2e6d-83ba-43e2-b405-d947e94dda5e','null','c3ecc32f-38c9-4583-a513-4a8b65b21a83','dca61bcd-2102-4003-b433-9b7a9d01dd90','1.0',NULL,NULL,NULL,'pps','pps','pps',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('69a32834-078e-48c3-8bd9-3125da2489b0','null','e886bdeb-5486-4ecf-ad03-56837ab6e550','5e749085-6671-4472-a068-e9a974324c2a','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('69d27369-08ed-4765-a489-968e1fafadd7','null','c91280dd-70e8-4ba6-a477-810629137b3a','f338dc0b-5575-4c38-b7e1-a9d40010de27','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6a44b6b2-f7fb-4e2e-b8a1-e1342275b86a','null','5b7dd098-162f-4424-952e-cd0a0cd39447','87cc7625-fc88-4fb5-98c4-be288c1cc25a','1.0',NULL,NULL,NULL,'TEST_server','TEST_server','TEST_server',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6a6754c1-9f43-4cf1-92f3-044b6147ddac','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','852c4237-cfdd-4695-9e75-bcd4cf7d38a3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6ac5b9e8-f995-4d12-bbcf-d76ba61ae8b3','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6aee8f5d-b063-4564-813a-8b671a3c5f97','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6b1675cf-f93e-428f-80e3-5ec838c73324','null','554d02b7-0922-42f1-b0ad-1acc91f1380d','920984a2-1ac6-4e29-b566-5a10a72c51d9','1.0',NULL,NULL,NULL,'app','app','app',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6b8f77a4-c715-4a2d-92d7-d8a96bddeea8','null','55372be2-6074-4793-92b1-e0fe1afb08b7','d03e16a8-becc-435b-aacd-829f6e3150b3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6b9dff87-0c04-4a10-a918-9b627e9ae0b1','null','2972ce9f-526f-471f-aabf-df99168287c4','f2609a4e-8bc3-4659-bef6-bf77667b37ca','1.0',NULL,NULL,NULL,'fe','fe','fe',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6bbd2dc5-5272-4012-a92f-f51387e1bed4','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6be7deec-f93d-48ab-a6c4-ea844da22d0f','null','0fb32d3d-d264-4bc6-95ab-77933bcf65b6','a77c9408-2cf0-4881-806b-bc2fd223018c','1.0',NULL,'Y',NULL,'vfw','vfw','vfw','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6c227dc7-acf3-41e3-9d0a-7aded6164c33','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6cb2be72-7210-492e-9f4c-4647b54d6613','null','b0444e96-4474-47b8-947f-65bc6d95e9e4','b7e37bdf-728a-4411-9fae-d1f789de3004','1.0',NULL,NULL,NULL,'vth','vth','vth',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6cf1a3b9-ef74-49e3-b682-34e57f79e22a','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6cfdeef0-8962-4d62-83a1-b11020d72aeb','null','11aa3eb9-b80e-42d9-b2f9-378e4da35112','ef6656e8-3029-4125-8d06-747429518439','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6d810590-688b-4419-aa25-04f0127a8286','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6e3b40fc-e28b-4158-ae96-fcdb901cb7f4','null','5bc33647-ba84-4ae5-8b0d-d310c512193b','3dced1eb-8c2b-49b8-9136-e7d912815e2c','1.0',NULL,'Y',NULL,'vfw','vfw','vfw','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6e5b8879-0cba-4804-b80c-85004fb8c3ef','null','cb6c8aef-d755-4d35-b1f5-c5d07aefdbd3','8005d90d-acd1-42f4-b7e5-f2c25324d3d0','1.0',NULL,NULL,NULL,'timesten','timesten','timesten',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6e5cb98b-a24e-4b1d-9504-ef472ba3b16c','null','ddb9b833-5751-4672-8b25-bcc78eb0d447','9f1aca89-2f9a-4043-9118-fcff91c4593d','1.0',NULL,NULL,NULL,'ppd','ppd','ppd',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6f39ab69-27f8-4def-b53d-906d272130b3','null','5d5282b2-1126-4a8a-aa21-f5b949d07ca0','89eacbb2-ccaf-4120-b1d3-0291917bbf71','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6f644aed-ee1d-4a4d-b2ed-a9c09a30aa7b','null','e22db314-cbc4-4855-9e9c-9fb503a376bb','de35db61-91fd-46b7-b123-02f528e055fc','1.0',NULL,NULL,NULL,'be','be','be',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('6fc2dc9a-1667-4035-b472-9fcbb22e42b2','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('702036e1-6270-4e3d-b2a2-8d6218dd325d','null','70fb6c69-f9bf-4a60-8104-b5d097578c4f','c6ac5abd-3f77-4c87-9a14-86c959a35dbd','1.0',NULL,'Y',NULL,'dns','dns','dns',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7040e1ad-9d82-42ac-a024-9ec2a454d8a7','null','176d464b-2c2a-4cd0-9c2c-9421c6636631','02302049-3007-4fda-9e34-1302757b65a0','1.0',NULL,NULL,NULL,'its','its','its',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7047a19f-6e58-420e-b83a-fc5c5ca371a6','null','5de3f65a-9a57-463b-8f57-42307d9b27f8','900b6e33-ce13-46e8-b9e9-56d21e4a4668','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('70575d9f-6067-447f-81f5-ea0f08ffdb1e','null','b53cb5a0-ed82-440d-b202-d827469c1b5b','15082ced-72ff-4a76-9b75-20f103e50ca5','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('708364f6-83e5-40dd-a3cd-1903cda658f5','null','e77e0faa-786a-40dc-aa43-4f303fef11ee','f50a5360-1a26-4258-a1e7-99fe806e1dc6','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7098128e-a6d9-4225-90ab-beac14b82ac5','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('70bf02d6-28ae-4bbb-9c37-0057017a15c9','null','bf3d2003-d439-423c-9389-09e2021f116c','dd83104b-5f15-41c2-8738-6d0bfecf8b71','1.0',NULL,'Y',NULL,'ellis','ellis','ellis',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('70e9a7f0-ce7f-446d-9606-2396e83503f2','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('71c83b70-fd19-4961-910d-0715abe8cd7c','null','5a315346-8d3e-4a2a-b4ff-a466fe54366e','d1c62b46-7a23-49aa-81c1-574694a4f33e','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('722602f7-f147-41fe-b72b-511af9552933','null','d5697262-b1cf-4b31-ac95-94fb30481b33','978dd3f1-84f1-458f-963a-52be9d81a3a8','1.0',NULL,NULL,NULL,'prx','prx','prx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('722b2624-586a-421f-9f11-97e442dd5806','null','e886bdeb-5486-4ecf-ad03-56837ab6e550','5e749085-6671-4472-a068-e9a974324c2a','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('725798c9-f501-4a90-9bc9-baba93016b34','null','ec1d2810-17b8-43a6-bf78-dacc26dd89a0','c726cf5a-f50b-42d8-89a6-3c55a21c1109','1.0',NULL,NULL,NULL,'par','par','par',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('726dd182-74f2-47a0-bfcd-fb1cea8d089f','null','faf71359-153f-4159-bc4e-290a85807d00','ade4b591-aabd-415a-84bb-e986d6ae635d','1.0',NULL,NULL,NULL,'sm','sm','sm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('72c1a9fc-804d-4316-b6b3-bcec6e1cdcdd','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('730589ed-f654-4727-805f-d845fae5ac9a','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('73909ae0-5388-4994-9eb1-47b334f23d4a','null','e886bdeb-5486-4ecf-ad03-56837ab6e550','5e749085-6671-4472-a068-e9a974324c2a','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('73c626ff-5b74-4f4f-a13a-a0998fa197e5','null','b2a5cfc0-a21e-47b6-95b1-d303f0b834a1','698a7342-8f09-446d-8115-a511d2b77dc7','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('73ea2af6-ada6-44a5-b9dd-921a65c3e3e0','null','7083fedb-430a-41bf-bb94-0eaf8b33fb30','39ff5503-11dd-4c6d-bf5d-1e1621cbf563','1.0',NULL,NULL,NULL,'its','its','its',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('740d504a-2e21-430a-8354-11304c0cb493','null','e886bdeb-5486-4ecf-ad03-56837ab6e550','5e749085-6671-4472-a068-e9a974324c2a','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('743a580c-a23c-4a21-a578-905d5c32d263','null','ae4b9316-37fa-469a-b39e-951b1e0684d8','43c4a39a-5f99-4cd3-80e1-288de3cf7be7','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1);
-INSERT INTO `VFC_MODEL` VALUES ('74a491fb-98e5-4988-aab4-173d018a29c8','null','44add117-31e7-4e66-8088-d338f2a25dd5','55f758dd-7bde-44a1-969c-82953fc9623d','1.0',NULL,'Y',NULL,'ralf','ralf','ralf',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('74c7e2a4-6625-4fc8-8a60-02c0e72e0955','null','1636f12d-c286-43d3-9473-b9723d5795e8','0531806f-4fed-4888-8f9e-bee67ab71ed0','1.0',NULL,NULL,NULL,'oam','oam','oam',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('74e26dce-9df9-41bd-a224-37ee65fb2884','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('74efb08c-7d76-4955-abe2-131f26c7c35b','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('75019b6a-8890-4a7d-87ec-35b64d18a34c','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('75192ff4-b321-4ac2-a3d6-d734fc8a7d56','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('752db263-360a-481f-8613-5205e3755d17','null','9793e8ae-82fb-4225-8cc8-ad0fa8d0532d','03996460-8c0d-42f0-abd9-96f2fb388fb2','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('754b4842-29a4-4559-9695-21269097b1ae','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('75855b5d-2b59-4763-905d-da64b66f4867','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('75999c1c-01ee-471c-905a-e4b895b01026','null','4c65d534-a3d8-4e43-97b8-9220a27ef727','54e5eda7-baba-485d-9979-1cff464f4881','1.0',NULL,'Y',NULL,'vmxvre','vmxvre','vmxvre',NULL,'ns.c1r16d32.v5',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('75fabac4-56d8-4976-899f-0119543fd2b8','null','e3f1a8aa-c1ac-4d38-9be5-d234d5c93d23','d35dbfd1-1c84-430e-ab65-252e47668116','1.0',NULL,'Y',NULL,'vdns','vdns','vdns','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('76040bc3-a498-468f-978f-6d4e7b9281ee','null','29a93f90-907b-48ec-a34c-b9aa916f748a','fa90882f-9b77-49fd-8f59-46d15df379a2','1.0',NULL,NULL,NULL,'rdn','rdn','rdn',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('767a2fb6-d382-4aac-bfac-b47c69cf8409','null','01071060-a604-4bd6-a228-2b3aebab1eb2','9b00b55f-c016-438f-9195-00a2d000a0df','1.0',NULL,NULL,NULL,'scheduledservices','scheduledservices','scheduledservices',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('76800448-f19b-4834-a0ce-65df373e6433','null','65f27cb4-bb17-48a1-96da-1317a1a97214','280e581e-35ef-45c5-ad23-9f9db4bfadf1','1.0',NULL,'Y',NULL,'homer','homer','homer',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('76b1cb79-11b3-4ade-867a-287368c711b0','null','c8935a10-d331-4cc3-8a16-3193dd459224','189760d4-5b9e-4287-b306-d27fc9cd083f','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7764f563-3f27-42ac-8cdb-481f64969cbe','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7775a765-9048-446f-b876-e0bdf8c4989c','null','81d23e7f-8cc6-49f1-b736-96eccad8103a','3b4e6f89-966e-4cb0-85ef-e8eee34b37dc','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('77812b13-4db0-4d86-abf6-a53f04bcdcfc','null','1c59c549-70fe-4a9d-ab0d-b65f29d6065c','dccf95fa-281b-43f9-a0ed-cc4bef6df649','1.0',NULL,'Y',NULL,'sbc_b','sbc_b','sbc_b',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7876ab13-7ce1-4f13-b63a-366e7499c74e','null','76f85d22-025c-4d9e-89b1-0711f5cb09c5','abf7707d-0ed7-492f-8edf-436cd01f10cd','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('79aa3ba0-0a65-4580-a6f7-e6670578458d','null','4df3b2bc-23aa-4f2e-8a66-19b86f4d248b','057c1236-b166-4ac8-8067-c18901bf4e0c','1.0',NULL,NULL,NULL,'plt','plt','plt',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('79b7c82d-4cf7-489b-a75c-0d55d1f2cc7b','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','852c4237-cfdd-4695-9e75-bcd4cf7d38a3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('79ce1cd6-854f-4c93-b3b0-1d0372d4a03c','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7a105b19-b89f-42e5-be0c-cf27b891f97f','null','a8c5d8d9-7115-44f5-a3a2-6482bbbc8906','2a228b84-405d-4c59-bb1c-351893a473b6','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7b276e5c-e8fe-4057-9422-91eb3def50b3','null','10421357-a2b3-4a7a-b82d-125b2805fa5a','56324cee-8dfd-48f3-aae8-3101be93cdac','1.0',NULL,'Y',NULL,'adm','adm','adm','{}','nv.c12r32d320s32',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7d1c65c2-059e-4883-b28f-799f5dae4329','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7d3af2a5-4d58-4f65-80c5-e9f56d68e374','null','57b11c42-ecd8-46d2-95f8-8157f4eec30d','c7e7d4d9-8674-424d-856e-3ae81adfb9c5','1.0',NULL,'Y',NULL,'homestead','homestead','homestead',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7d90d5f1-df81-4a1f-b6d0-ec1237ec0ecc','null','559e09d4-8cd8-477e-ade1-56d12cc7ec89','16e20c1a-fc9a-48b8-afa5-bfa59dbacc05','1.0',NULL,NULL,NULL,'vvig','vvig','vvig',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7dd7e5c9-4337-4ce0-8fb2-ff26f0a3ca52','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7e59838f-0274-458f-a34f-9b91d79c3e1c','null','671e38f2-c1f1-4112-bcb2-e2300efc794d','c1075235-d9c2-4a8b-8215-7e3ccb168ac5','1.0',NULL,NULL,NULL,'its','its','its',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7e943e8a-c651-47be-9e27-630b9efa5940','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('7eff938c-6dd7-4bb5-a39c-b7935329ee2d','null','0cb480f6-dfbd-4af2-84b0-52b212694070','ec33342f-14ce-45b6-96d2-ac4403ade6f9','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('80322740-def3-4b97-bc68-74735d1ac282','null','6eb9f47d-23c5-4f36-a5be-49be4c168623','6be1b41b-c7b5-4d18-bdbb-ab1784f2392c','1.0',NULL,'Y',NULL,'vmxvpfe','vmxvpfe','vmxvpfe',NULL,'ns.c20r16d25.v5',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('805be1fb-285d-4487-a9a2-223e995df5a4','null','7609a0fe-38fe-478c-b46a-62ac6d7861aa','76a8998f-41e7-4699-b31e-1dc3e052989a','1.0',NULL,'Y',NULL,'vdns','vdns','vdns','ubuntu-16-04-cloud-amd64','m1.medium',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('80a6176c-fcb5-42ca-a738-3fa40ea2660a','null','1bcebed2-1f21-4264-b163-931211b1bf26','883a1cb8-43ca-4a52-b6b3-225255514bcb','1.0',NULL,NULL,NULL,'cognoscgw','cognoscgw','cognoscgw',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('80ca15af-4b70-4ee7-be37-0b1de73051a1','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('811e1edf-aa75-4d07-b98d-f47ccfa3ae35','null','078b52a2-53d1-4d1b-8465-05beb27dd991','cd8a79b8-4384-4018-b8f2-0be19981c206','1.0',NULL,NULL,NULL,'oam','oam','oam',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8127a732-3cba-4644-b86f-98327b512373','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('81d694d8-7253-400b-8310-a2d6489a523e','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('81f47a35-0ed3-4df8-ae79-70dffcda63c3','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8297192b-fb85-4459-aa83-15f19d3140b1','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('829fee2b-5317-4793-8c4f-2ac8de1b73c3','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('83c21766-f7b0-4c8c-a3e7-143c5469019e','null','10421357-a2b3-4a7a-b82d-125b2805fa5a','56324cee-8dfd-48f3-aae8-3101be93cdac','1.0',NULL,'Y',NULL,'adm','adm','adm','{}','nv.c12r32d320s32',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('83ce6e22-8cec-477c-b750-a37a14ae5450','null','ca5310cc-a0df-4f90-9775-d0a8741a1587','a417848b-ff41-4399-9d70-cc64a27fa576','1.0',NULL,'Y',NULL,'mon','mon','mon',NULL,'{}',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8439b3d0-35bc-48ab-8e13-6c08022a5a9d','null','e886bdeb-5486-4ecf-ad03-56837ab6e550','5e749085-6671-4472-a068-e9a974324c2a','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('859d4704-b610-4a2b-b112-000e403e823b','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('85fdd64a-9f2d-4f27-a4ab-78f1a3a15200','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('86238ad4-5842-4d03-af1c-2f2ac40a6123','null','72308d7a-5d2b-43d0-ab9d-1839fae15b63','f2c093f3-2f6d-46dd-880d-2831569cdaa9','1.0',NULL,'Y',NULL,'adm','adm','adm','{}','nv.c12r32d320s32',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8767130c-3c4a-41df-b78d-16d674949746','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('87715b73-66ea-4e22-8b92-d6130a757d96','null','ef8e9f97-1c75-47a0-a3f3-f2e932a44b40','5b9af18a-e42d-436f-b61e-08d55d6f3050','1.0',NULL,NULL,NULL,'apigw','apigw','apigw',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('877a120e-1d41-4f74-865c-8a9d32b7f00c','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('87c8ce73-2771-4ac1-b592-1d0fdb0806f6','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('890593d3-885d-4919-89da-838fa12b4790','null','7afbfe3b-a909-4682-80d3-f5a1a57713ac','83458031-84c2-4d06-b977-53fe9b5d8100','1.0',NULL,NULL,NULL,'app','app','app',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('891c94d3-bcff-4d5f-8a92-f1ef951fd9c4','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('895bba6a-2e3d-48f9-9e93-7a3de18b703f','null','51a669a5-4c83-4231-8aa0-9939acf835ef','3b97c83c-ee8b-4eb7-9910-428b7a58d9cb','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8ab47c0f-a4c5-43c3-9ebb-6dba37f4c576','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8ac0cb3a-dfb9-478b-96ab-c5ff0abb9609','null','00648ac2-2381-4235-843e-882d30c6f7b2','7982cd91-807d-48cd-a3f2-0c40777b3df4','1.0',NULL,'Y',NULL,'oam','oam','oam','NIMBUS_PCRF_11.0.0Base-ATTM1.0.0.qcow2','nv.c12r48d100',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8b3798b4-65d1-4032-a2b9-83b3708945bf','null','6685b9d7-ae66-490a-8967-520549f7d6e5','f4c18fb7-ea8b-4e89-82e7-26525c528079','1.0',NULL,NULL,NULL,'fe','fe','fe',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8b84aeae-51cf-48c2-8bb1-50c7aa444a16','null','84dfff0d-74df-4782-afc9-8a902db20c89','621eac8e-ade1-4d21-86a4-1a66caf964db','1.0',NULL,'Y',NULL,'vgmux','vgmux','vgmux','vgmux2-base-ubuntu-16-04','m1.medium',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8be6b1e3-cfbb-4f62-8820-067bc784585d','null','55dd4bcb-e217-4253-9412-46c3db9b87fe','52f53983-82ba-4069-9dbe-30a18514a879','1.0',NULL,'Y',NULL,'vfw','vfw','vfw','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8ca7da2f-1cd5-4493-ab82-805f48d8bd71','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8da61575-f78e-4170-9b19-ebb14fb6c211','null','686e6906-6dad-42e4-836d-b01dfd8dcd3b','050dd517-57da-45ad-86c8-d6c2d9cf742b','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8e4a567c-3a73-49c2-95a9-2b092032ab10','null','801f48a5-eb2c-49a2-a03c-4a3175bacbc3','4fddcad8-91f9-48cb-902b-b05fcd1fb98b','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8e5d1a2d-9cf9-4988-961a-2e95772656d0','null','b95401c8-5c5e-48b7-9839-d581cfca5935','4c671c7b-3ce5-48d6-b7ca-4047c3ebb2ef','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8e666420-f2c8-47ab-b593-ab4bd748460c','null','fd0b5273-f01b-4129-8a20-447567d7c370','94bcc5fb-18c9-47f3-9bc1-db73fba3c210','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8e7289ce-c299-4ab5-8be7-245ef7b410db','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8e80f851-fe0b-4363-81b8-f7bd0e59016b','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8e8a56fd-db66-462b-9e06-81e507a74a36','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('8ec1d032-e5eb-462a-b96c-40bed1028f51','null','efcc4117-0c1d-43fa-b80b-1f34712021bd','cc772cf5-fc52-4cbb-8b6b-a58da7e40abd','1.0',NULL,NULL,NULL,'ps','ps','ps',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9066cc10-a5a1-4f0d-9498-7ea314e836ba','null','767cf039-9261-4efb-b63b-1f48a3391e74','ed19a0e7-2486-4c67-bbbb-01514efb4dac','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9112fca1-6b0f-4f7a-9d1c-ed930ca86ffe','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9166ff2f-23cb-4028-97e5-dc591fcfef3c','null','e3f1a8aa-c1ac-4d38-9be5-d234d5c93d23','d35dbfd1-1c84-430e-ab65-252e47668116','1.0',NULL,'Y',NULL,'vdns','vdns','vdns','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('919ae940-5485-4270-9bb2-980213db6b95','null','851441dc-e28f-47d0-b36b-11fc3729d20e','90eb0836-f116-43b8-ba3a-83ca89ca84bb','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('91c98964-347d-48e9-851d-57e22c4dddea','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('91e52c46-6dc8-4535-b1db-f1477ecfcaee','null','f61424d4-acc4-42ae-8a41-03a0bc098132','c2039665-e5f5-4114-a94d-74804cac2ea0','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('922a84a0-d9ce-4ff7-b6bb-7d1ebcaa0c1c','null','c7efdf88-8a09-41d3-908e-d1e513b3c745','a2d5099b-4254-4f7e-8d3d-ceb280571ee1','1.0',NULL,'Y',NULL,'plt','plt','plt','USP_IECF-PILOT_30.3.3-mcas4.4.6.qcow2','nd.c2r4d50',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('92f5bbb1-3215-4a80-95fe-aba44d79fb69','null','1efb8470-f0d6-4e69-97eb-7dbec527dc6d','eed80211-44a5-4f21-bb1e-83b82635bb3b','1.0',NULL,NULL,NULL,'pcm','pcm','pcm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('934d8e29-ab23-489e-910f-3e16db969d81','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('94738c09-9e9a-47e4-a444-c262328e1741','null','00629390-ad5c-4a52-a04e-1efa3b2c9dc2','ea761b8a-e27f-470b-ba8a-a89e9b61b467','1.0',NULL,NULL,NULL,'sm','sm','sm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9519bd6e-527c-4f7a-a013-dd478fad64bd','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('953f220f-a3f1-4191-a7eb-722f841f2c0c','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('95b5cde3-d489-4329-9b75-2aa01db6e6a1','null','720c36a7-9380-4c11-a8ce-acb2ad5c2d7f','07285e73-89c2-4330-b09d-65f568c976de','1.0',NULL,'Y',NULL,'vdbe','vdbe','vdbe','SRX_DBE_15.1X49-D50.qcow2','nd.c2r6d20',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('95bdd202-1f6a-4812-ae1f-c8df2ed8ce9c','null','324ba26b-468f-467b-9b49-021f76720277','ebffbeff-3b15-4ce9-abe7-654f0bd8615f','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('964808cb-2199-44fc-9390-004b8fa8d538','null','dd0137f5-c6fd-4990-a217-8e3c41838bd3','14c13c2e-dccd-48af-b46a-5526f6640a63','1.0',NULL,NULL,NULL,'its','its','its',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('967653fc-d781-4f65-b513-7a111d854ffa','null','f0d528fa-8ae2-4548-9e59-71bdf5b16b2b','d18b5d59-c65e-420d-ae28-8181e87520b6','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('970657f6-a90a-4758-ba4f-512da3aa07e4','null','47e50720-58ad-41d5-a89d-a290833d5170','3ec89b15-8ef3-466b-8b6f-f8e658793601','1.0',NULL,NULL,NULL,'fe','fe','fe',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('97dafb56-c3df-4922-970d-b514118b1196','null','f0d528fa-8ae2-4548-9e59-71bdf5b16b2b','d18b5d59-c65e-420d-ae28-8181e87520b6','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9842c47b-f484-4de6-864f-ca4fdaea3cad','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('98608c67-9b1a-4160-849c-060171c0ae16','null','88fea698-4f2e-4b8d-bdaf-d60a8d9f921e','f62868c7-2afb-4ad8-a940-8b9db7b4e71c','1.0',NULL,'Y',NULL,'vsn','vsn','vsn','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('98f311f9-39e0-4b96-be75-548fe6953247','null','c46d1478-41bc-48d9-863b-0ac70a2e6972','138dab0f-355c-4e32-82d1-66838992a8fa','1.0',NULL,'Y',NULL,'vsn','vsn','vsn','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('99699375-0397-405b-89c7-32fc9f714e0a','null','27f6423d-ab25-484a-86c7-038925e4cf30','10078587-93b2-4ec3-be27-c9172716e3bf','1.0',NULL,NULL,NULL,'be','be','be',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('99781b3e-7c91-432c-af97-dccdf0e31281','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('99a274bf-c3fd-4d63-a4b1-1c7b4d9312d6','null','05c097e1-9d0b-484d-9d3f-b4c4ecf6938b','f61c31cb-5ffc-47a4-b423-4aabc4afb2d7','1.0',NULL,NULL,NULL,'app','app','app',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('99bd7230-87c4-4dc5-aba2-4a63ad55954c','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('99cab556-8786-4fdc-8ff6-284aa7d47fa8','null','cb26bc79-f5c2-4d70-96e5-8ef2ec5cb2f8','2354ae73-a126-4797-8136-56d5320c4efd','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('99f10ccf-e4d0-4c1a-87fc-9d4403f9bb57','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9b5fd226-047a-4702-ac8b-d84a4e12bcb1','null','544f081b-41eb-41ed-aea3-82a53f8406b7','fd49fdc5-aa89-4528-88ad-7ab74497826e','1.0',NULL,NULL,NULL,'TEST_server','TEST_server','TEST_server',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9b68a223-ae32-495b-9dbf-706d17f4edca','null','fd0b5273-f01b-4129-8a20-447567d7c370','94bcc5fb-18c9-47f3-9bc1-db73fba3c210','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9bc3396f-861c-4bb7-b11c-e40ed9fc785b','null','51a669a5-4c83-4231-8aa0-9939acf835ef','3b97c83c-ee8b-4eb7-9910-428b7a58d9cb','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9cb550ff-94a8-46df-b216-8d8d79a4430c','null','3021e249-ce61-4921-97d3-c620fee735d8','f5d1a9de-02c5-408f-9a58-f3f7dc40e91d','1.0',NULL,NULL,NULL,'converter','converter','converter',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9d25a319-184f-41d8-b361-b3c34780815b','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9da1a65e-107f-4c2f-b3aa-5741f9ec4246','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9e0bae98-f88e-4afa-987e-44d6bf49d222','null','4dbb5f94-045d-4daa-8cc0-6b67b14733e8','e41c812e-482a-4831-8a61-90ca514afc64','1.0',NULL,NULL,NULL,'mmsc','mmsc','mmsc',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9e9a03db-5e18-4080-9a99-3befee79d106','null','8cf09ba8-a266-426d-b10e-77f8bfb0fa2f','e628f731-8879-41c3-b391-482b2d255f7d','1.0',NULL,'Y',NULL,'rtp_msc_a','rtp_msc_a','rtp_msc_a',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9ead1a85-5592-4784-879c-147a94bea966','null','b2d3805f-a918-4f95-b4fa-f6c5b8dab1ca','2e090e82-864f-4d48-9c74-dd8a812c2396','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9eb9415d-9c3a-499e-9889-d97647df8b41','null','fdb7b451-b225-464e-92da-fe01b24215e6','12b488c0-ff81-4840-930d-94020426b7da','1.0',NULL,'Y',NULL,'adm','adm','adm',NULL,'{}',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9eba7181-1630-49c1-8698-a94dd8ca95b2','null','2e0cd406-2bdb-48dc-b262-c7e45f1216b5','4f3990bc-bedc-4308-a3ac-6900eb684e9b','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9f07ef60-6dea-4e20-b4d4-c78b1b8bda32','null','c5dfffac-1a54-4f68-8620-f98209e6a99a','f9c80fce-dff8-469e-ba9e-e8e6cf1842e4','1.0',NULL,'Y',NULL,'vbng','vbng','vbng','PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)','PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9f0d1717-e20d-4c2e-9c64-f7ce4b9b13d4','null','c30e7d17-563f-41fc-99dc-6390c831ee08','367294b2-ef14-49bc-8b01-d7cfdccaf0c1','1.0',NULL,'Y',NULL,'app','app','app','USP_IECF-APP_30.3.3-mcas4.4.6.qcow2','nd.c12r4d50',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9f240ab4-117b-4bd4-aeac-432607eaeb6d','null','5c92f734-aee4-4431-bffd-4b1613b40eed','d39c7ac8-25d3-47b0-a10a-7474dad90e21','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9f4130d6-6e88-4759-a635-ff24c6c7814c','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9f46cf9c-6b2c-41b8-a4b6-27b5e6373538','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('9fad30e6-3822-48a6-ad15-caa62566abe6','null','3ab414a7-b8b9-49ca-96c5-8e0bec348412','52e44eae-1f79-43ec-ac74-cf6501fb6e26','1.0',NULL,NULL,NULL,'oam','oam','oam',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a00628bd-e870-4679-80ed-0423caad18df','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a0083208-228e-42d8-82db-ff463b8704b8','null','1dff89b9-f323-482b-b7a7-e049f9ad7635','0ce097c2-4121-449f-9f98-63532a8bff55','1.0',NULL,NULL,NULL,'vertica','vertica','vertica',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a0154f8d-ac4d-4af1-abd0-e660f7562d35','null','4ca1e003-d833-4bdc-877a-e4d7aeb6a4b7','2b6676c6-90b2-4d39-be19-b1ffbd23f558','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a0ec6cac-6fc9-4429-8387-93593d2072df','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a116fc55-74a0-4d69-b034-34170799ac3c','null','cb8841a3-5eb5-4c72-844b-16dcb0d3b7e4','c4342af1-f173-4d83-bbcb-0c9fdd7b9567','1.0',NULL,NULL,NULL,'d2ice','d2ice','d2ice',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a1b72bd2-0d25-4031-973a-c9600dab5f78','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a1cd762a-7c3c-4839-a2eb-e77bb374eca3','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a1e0d30a-598b-43cf-b1ef-62158ffc70eb','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a26fdde2-478b-4b1b-ba35-af8b6f3da856','null','10421357-a2b3-4a7a-b82d-125b2805fa5a','56324cee-8dfd-48f3-aae8-3101be93cdac','1.0',NULL,'Y',NULL,'adm','adm','adm','{}','nv.c12r32d320s32',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a27d8879-67a2-4537-b326-2c072e31f68c','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a27f0fb5-4744-4b99-af5b-1dd1d59c8725','null','c6f03037-253c-473b-a538-73246b291185','cb19a064-c90f-4d71-b01b-a0bca8ed5e4b','1.0',NULL,NULL,NULL,'itm','itm','itm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a2a8f05f-7d29-417a-af2a-00c3ec229246','null','ce2aa7f5-6fa8-46c1-9790-8ae7b49a6306','e395e992-e359-4635-a463-ab9b9fb027bc','1.0',NULL,'Y',NULL,'mda','mda','mda','{}','{}',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a3dd0b00-859a-4567-afd5-08efb92072e7','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a52999b1-dab9-42cf-9853-1d831eb0d318','null','b173ab2a-9b2b-433d-883e-3c153f39c331','464f4ed6-75d9-4a48-bb9c-9a49b4da172f','1.0',NULL,NULL,NULL,'oam','oam','oam',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a54fdfd0-33da-462b-883f-f7ddc2d86e1c','null','86f39736-fe98-410c-b0a1-12baf7a64626','369abd2c-c79a-4ee3-9152-a158a8e160a9','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a5653b1c-6e73-4ee6-a5e0-5f1bcb1ea959','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a5ece57f-58c7-4e9f-80f4-6a2d0a4bec38','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a5f25e31-5059-4d50-97ef-26735df799ed','null','9e4e3726-d8a8-4a40-8fae-f4bb46135d3f','08253508-dd15-4202-bfaa-c105f0a8c19f','1.0',NULL,NULL,NULL,'sm','sm','sm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a60c2994-8089-42ff-90ce-656c6aeeac42','null','7513c82e-63de-47f8-94b6-83ea61446fc1','82104fb7-3f0f-4c6b-97a2-adce8c48a7b2','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a682c9ab-b50c-429f-a605-2469a4efb829','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','852c4237-cfdd-4695-9e75-bcd4cf7d38a3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a698af7d-6797-4807-907f-f9e60593d082','null','90177c20-11a9-4a85-bac6-067f4c88403b','cbae819f-fe79-4031-8a06-79026c8eb1fe','1.0',NULL,'Y',NULL,'adm','adm','adm','{}','nv.c12r32d320s32',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a6d1fe14-e363-4c05-9c68-a23e3ff4e816','null','55372be2-6074-4793-92b1-e0fe1afb08b7','d03e16a8-becc-435b-aacd-829f6e3150b3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a727ca3c-cccb-45fd-a3dc-1b030b1fca71','null','c12a93bb-bb70-4f40-8823-155980ad078f','cef11b73-aa73-4f88-8b6c-34d21d55b8cf','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a72f75fc-126f-4a3b-a125-a33e89fb3ca6','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a7fad07d-f91c-44fd-98f9-4952f35f3875','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','852c4237-cfdd-4695-9e75-bcd4cf7d38a3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a808430e-4931-417a-b6d8-183a719d1803','null','83429bf9-49f1-4187-a5ad-afc329a84e76','ce422e74-7e58-4464-8a54-61e21f3ca7e5','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a8bb4868-11f8-4eaf-a411-007f6691ef99','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a9139e95-84ea-42d7-a4bb-a72b29a40970','null','d6972850-e417-4146-8a3f-c645769f6d1d','49956ca0-99bd-4ad7-877d-ec831af96a10','1.0',NULL,'Y',NULL,'vsn','vsn','vsn','PUT THE VM IMAGE NAME HERE','PUT THE VM FLAVOR NAME HERE',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a91bc7ee-82ae-46b4-9eb4-4a92fef3f00c','null','9e68d141-f3ab-4436-a1a6-52f83a2908ba','7d33eb47-6050-4ef6-aea5-0485360ff4e8','1.0',NULL,NULL,NULL,'app','app','app',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('a99c320c-64d0-44ac-8edb-16d781dde678','null','3ea59343-7575-410b-81d5-0dcc7023c3ef','ef0a6627-dd24-4d26-8e42-3e4981322a68','1.0',NULL,'Y',NULL,'ellis','ellis','ellis',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('aa008846-3e9f-462e-867d-653358cd6d8d','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('aa8a4494-cd9e-444f-a174-9f2590bbc692','null','178dcae6-892b-4fd8-9da9-bdf30da013ae','50d30dc2-fe59-46be-92e1-2844868bf1ab','1.0',NULL,'Y',NULL,'vmxvre','vmxvre','vmxvre',NULL,'ns.c1r16d32.v5',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('aa999b75-51fd-451a-8556-c59e13cb3cd6','null','260bcfcf-53b4-4f7e-b387-d962b411a90a','0cc735dd-8c55-4de1-829f-b307806ddbd5','1.0',NULL,'Y',NULL,'vlb','vlb','vlb','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('aaad4b91-f2bd-4157-b386-fb7955b1dfc9','null','9b3265aa-64a8-498a-aa68-2d6a65c34ac2','d3351d9a-5b8c-423f-b63d-bdba0716b04f','1.0',NULL,NULL,NULL,'app','app','app',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ab26b6c2-af90-4f66-bc2b-f500a3ca1a5c','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ac0cd98d-35ee-438c-a45e-9a2447c603a4','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ac377ae1-fd6b-41e4-9aff-a6b2b038d484','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ac496aaf-ecff-4db3-acb7-cd9989db2b21','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('aca91a09-aa6f-4701-bce6-2ded800ac69a','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ad6791e1-eefe-49b4-bce3-3e5b76555fb9','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ada34b73-f715-41eb-a6ad-c9d868e86728','null','c35a90e5-6c43-4c54-8953-18053879258a','ce4bf871-1817-475d-ade9-39e7095f12b6','1.0',NULL,'Y',NULL,'dns','dns','dns',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('adcc1687-2e29-4b48-81cf-d671aaff5cef','null','d2c6e47e-7320-4559-876c-65f21e71be94','71db90f8-ae2e-44a2-b57d-e96de3f89b66','1.0',NULL,NULL,NULL,'app','app','app',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ae6938ed-7d85-4d1c-b08b-683eaeeb8861','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('af36dd7e-6e79-4b5b-b031-d1a7ff2876b1','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('afc8dd7b-f829-4d44-a52f-ee0665d770b7','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b04d88cc-cf85-4968-82c8-c950f4487d0c','null','143fc587-69af-4c05-b624-d5d0cf0d2b44','4b5305d2-022c-47ab-8f47-7f795a6a64a0','1.0',NULL,NULL,NULL,'be','be','be',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b09c467f-048d-42e9-a127-79c8bf3b090d','null','5818d233-caf4-4825-a7bb-144bbd731329','b8c28cad-e97a-4ee8-bc64-119b373cf98f','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b0f2b86e-1b9a-4d3b-9dd8-ace1ee07976f','null','3ca34c00-47ad-407b-8b31-d209843f7a07','a6a47256-5dad-44bb-afd3-a3dcb58b6493','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b14c2a09-89e7-487f-95ec-1b5bbc3399e4','null','ea6ed17e-b52c-4a66-8bb3-8e5f6f3fef39','c14a722e-7f86-4577-9583-ba9397a2a54d','1.0',NULL,NULL,NULL,'app','app','app',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b1ff5519-4c6c-4378-99ab-df79b2802406','null','64607264-f245-419c-b490-5b40cdc6c8d1','23aee13f-2ba4-4f62-8739-60655b38e537','1.0',NULL,'Y',NULL,'ssc_a','ssc_a','ssc_a',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b2f1e772-dc8d-4048-b984-441ad81f3955','null','51a669a5-4c83-4231-8aa0-9939acf835ef','3b97c83c-ee8b-4eb7-9910-428b7a58d9cb','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b328a3fe-e2c5-4fc0-800f-f3a64ca779d4','null','231e7f44-fdbc-40a0-b836-c3302421004d','e66f3e27-27f7-450c-b3b7-cdaf43d262b6','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b36490f4-abe6-4951-8f46-72889c614c4a','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b3a64b54-ea13-43c7-af8f-3b69a538c213','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b4100792-9341-4078-bac7-404b684f211c','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b4100ed9-507a-4be4-a456-0e49482a58ac','null','0f130462-8f4e-4670-869b-37eb02b04577','db498075-2ff5-4947-92a6-10745aef5589','1.0',NULL,'Y',NULL,'vfw','vfw','vfw','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b4483cf2-b435-4ed2-b45c-93a2f2bcda66','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b6444afc-7bf1-4170-83f7-8c932d5a55c9','null','e886bdeb-5486-4ecf-ad03-56837ab6e550','5e749085-6671-4472-a068-e9a974324c2a','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b6d5b572-0a9d-4de7-ba44-bd02bdf95626','null','5e6be389-4ca1-4344-b497-d40e7d76de5b','280afa6d-83d3-4ecf-9cdf-47a2e4b0431e','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b6e7344e-5dc6-4b71-9735-fc047e5b999a','null','49c1424b-5e2d-4e16-b1f3-1f20fd529925','651bfb5d-d5cd-4ef0-bb26-0eb3bbbe71b8','1.0',NULL,NULL,NULL,'psm','psm','psm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b6ff6a80-ee73-415d-b4d8-9e97cd788e1d','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b773d671-6888-48ca-8ba8-609371bfccb6','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b7cf537e-9b62-40e8-9f1d-278ff0b7986e','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b858d606-617d-4b29-b749-e51e70c52e5c','null','80501dcd-d0a6-4101-92b2-6a2249258d4f','e2eb1e3f-ca9a-406c-bcfe-d53b87e0fa27','1.0',NULL,'Y',NULL,'app','app','app','USP_IECF-APP_30.3.3-mcas4.4.6.qcow2','nd.c12r4d50',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b87c7274-78d0-4549-ba63-9fdbdefe239d','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b8935925-e0bb-4103-b64b-14e24237599b','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b8cddb4a-babb-49e0-a369-4ba04908d4f7','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b8dd3ed9-cc4d-484a-af2c-0e18f4568fb3','null','0fe506c3-fa0f-4811-b3d9-9a5e1d316cbb','305592e2-01e7-49f5-baa9-207e47b4eb76','1.0',NULL,'Y',NULL,'vbrgemu','vbrgemu','vbrgemu','vbrg-base-ubuntu-16-04','m1.medium',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b8e49d1b-e5ee-4e25-8d20-61e5588f5f87','null','a17323d7-1f15-459a-93a1-2523b2dcc909','78a657d7-74d1-44bf-939c-73d748dc4ebc','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b95b06d3-f566-4d75-a43b-fbf94d9f9645','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','852c4237-cfdd-4695-9e75-bcd4cf7d38a3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('b9b64e3f-7b45-4293-b742-21b5bd63fac2','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ba3c401d-def7-4085-bd8b-5cfad9cb94a9','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bb0cd22b-bb81-4fbe-b756-94cd3b94255b','null','51a669a5-4c83-4231-8aa0-9939acf835ef','3b97c83c-ee8b-4eb7-9910-428b7a58d9cb','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bb4916f2-6ce6-42df-a1db-ebebd2ae420a','null','ae4b9316-37fa-469a-b39e-951b1e0684d8','43c4a39a-5f99-4cd3-80e1-288de3cf7be7','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1);
-INSERT INTO `VFC_MODEL` VALUES ('bb69f2d4-be8a-400f-9d6d-6e9500664dbc','null','df3f9aab-9c2f-42ef-bfe9-6eeb4102b650','1cd4cc4b-58e2-48c5-b2dc-69779071f8cc','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bb6da603-e8ec-435e-b84f-27e3985a1f91','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bbadc8e6-b898-46ef-8204-06e125a690d6','null','44c2244b-b8c1-4788-886b-28addae150ec','76408aa4-80ce-4974-aed7-77336f6fecb0','1.0',NULL,'Y',NULL,'adm','adm','adm','{}','nv.c12r32d320s32',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bc5ce901-76a8-4516-b65d-26cec4ba463c','null','0de693f7-e09a-461d-b9d1-cfd6919b8f0c','49954541-0f93-489c-a9cb-cf9fc8e986aa','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE VM IMAGE NAME HERE','PUT THE VM FLAVOR NAME HERE',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bcbc6708-3697-430c-a8e8-6250939ecf5c','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bcdd7c03-4140-4378-b00a-3775089ae232','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bd18c89f-92d2-4cc9-ae09-dac57219db9a','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bd800b26-228f-40db-bd98-dd4afade8ee4','null','a768414c-507d-4120-a1a4-ed2c1ec3f4ad','8d8fcea8-4352-48a2-8e39-10b3b8862743','1.0',NULL,NULL,NULL,'cm','cm','cm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('be1a6293-fa3b-4a2f-afd6-480f2e70a5d2','null','bfc9b3ec-9c4f-4caa-9489-4c3e6c99a4ce','9fe7109f-e328-4ae1-aa27-1ea33b72613a','1.0',NULL,NULL,NULL,'sm','sm','sm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('be65d2ae-31cc-479c-9156-e7f1d6b6a4b4','null','f30f9166-702e-47b8-8f0a-d5523f86b7d6','73aaf1fa-265c-4f13-a171-ca8dc4c908ff','1.0',NULL,NULL,NULL,'qtrace','qtrace','qtrace',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('be96e427-e84c-4a57-b169-5490bc2bde4c','null','fc60c10b-f1ba-4e3d-9c41-e4eff820162e','c05c500e-e9c8-4edf-9e94-6af1779e62c0','1.0',NULL,NULL,NULL,'mmsc','mmsc','mmsc',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bf11ea87-eca7-4bfe-a958-a6395c14c11a','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bf4cfefa-3bf4-43a9-a7b4-d091f92586e3','null','484fc852-b184-4321-ac3a-0a95d254fa6c','31be2acb-c53a-4a8c-a3ed-ff6d2db67255','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bf9a909c-17ef-4a69-ac1f-56d05c53c528','null','9313568b-b485-40df-8e3a-2e541a8ca32c','a3f4879b-b668-49f1-b57e-372271b0cdaf','1.0',NULL,'Y',NULL,'vgmux','vgmux','vgmux','PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)','PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bfbbab1c-b257-4ea9-81e0-416755b28df7','null','3ecec5d9-7517-4970-9977-242b02f6cc92','eccdf6a2-4ad6-456b-892e-7b4109308445','1.0',NULL,'Y',NULL,'vdns','vdns','vdns','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bfd5e865-92a4-45a1-888d-ba7c2497ad50','null','87675787-232a-4648-affd-fa4522faffac','557bd559-76ce-412f-9b4a-c1fb37039c97','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('bffb18fa-e09f-4d2e-9a56-6f032e03ac19','null','03d45358-a5e6-4584-a9b7-fb5e9333726d','3a32e5f8-744c-4c90-9dce-42b67c21b1af','1.0',NULL,'Y',NULL,'vsn','vsn','vsn','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c0228379-2c35-4d53-bffd-b22f70e5b131','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c0269cef-1de3-4b79-8c45-790e56540ac9','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c05551e2-d5f7-4fba-bd08-c76085bc0bd7','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c0a21a31-56f6-4ed0-9647-f2c9cfb22737','null','482d5ad8-7f48-444d-8b45-2817b8309075','2c1d7d2a-0122-4a1c-8be6-ce19cd9c3592','1.0',NULL,NULL,NULL,'app','app','app',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c0e635b4-e210-4c0a-ade3-943aab8ee3e3','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c16a5cd1-72ed-44b9-b4b0-fd0b8a8a3710','null','2b39f3e1-0dce-4786-9d9b-ec9613ce350c','96f733e6-9ed1-47e1-a77b-f1cabbecd142','1.0',NULL,'Y',NULL,'vdns','vdns','vdns','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c1cba325-dce0-418b-9ec1-61bf6ecac873','null','e2d673cd-88da-46ea-a591-5f2b7c835639','279ac5e4-a5d9-48ab-82ab-9d336c0f96d3','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c231d966-7c33-475b-b1da-6d8183a14f36','null','56717920-49da-473a-a453-efb044590ca1','a097e7bc-fb30-41cc-99b3-fc82f9fc701d','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c23ac2f2-56ff-4ecc-b65d-65dd8f82a0cc','null','629adabe-cc44-4989-8f2a-75b55f7737e4','e82cdbcc-5bbf-4dcb-9a0f-17c6e4766801','1.0',NULL,NULL,NULL,'daemon','daemon','daemon',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c2655316-7724-4fe0-9ace-cad170838ed0','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c2bc34f3-ec20-4f40-a6ff-c0913ac9b180','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c3afd8d5-cc77-43e9-baaf-7caf60146b15','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c3ec6c74-294e-4eec-825e-3071b55a08c0','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c43aef22-8dd1-4e8c-8169-f88da3ef2160','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c4753b00-af1d-4b49-bcfa-475effeaa3ca','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c4c23e62-b07d-4856-ad5b-af6a3980fae2','null','e1158f69-c65d-4b6b-8332-46ef339ffc81','9a2de0f9-0535-4bf1-8e5c-47cfd7affe43','1.0',NULL,NULL,NULL,'sm','sm','sm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c4d1cc21-49d5-4f45-a6ac-539165918edb','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c504575d-ec87-4c75-b3cf-26b561c77c8c','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c5a89a5b-e5bb-47eb-a382-b46cfe8adf5e','null','c71badb8-3578-43e7-ba36-eec3fc1e4f83','12ae7ede-f3d8-40f9-a8b1-44d5d4f09126','1.0',NULL,'Y',NULL,'vbng','vbng','vbng','vbng-base-ubuntu-16-04','m1.medium',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c5d7d223-39d1-401c-98eb-0680733d2872','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c5eb0c33-6a51-400b-8186-d7fc1f0bee13','null','e996f365-b29f-471b-8b32-baf93152eb81','c3f2985e-1999-419a-bcf7-91560cca1a1f','1.0',NULL,NULL,NULL,'smp','smp','smp',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c6e0a9c3-babd-4517-988c-5f0c90877b1c','null','e886bdeb-5486-4ecf-ad03-56837ab6e550','5e749085-6671-4472-a068-e9a974324c2a','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c788c709-f8a6-453e-ad1e-8dfa63492dbb','null','8a895561-a663-4b64-b421-7416bf9d4a8b','795d516f-34ca-4a0e-a74b-c4746eae4300','1.0',NULL,NULL,NULL,'code1','tag1','tag1',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c7b54e8e-8121-4102-b5d0-b25181920fec','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c7d68a7a-7496-46de-adef-dd7b82f2e742','null','00f8e942-ae52-4da5-b459-8fb54eee2adc','b1b37903-9386-4912-8a60-ed692a03b52c','1.0',NULL,NULL,NULL,'ps','ps','ps',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c8033d10-afbb-4310-b90b-abd4140c191f','null','54f59033-8deb-403d-8cba-2d4b5dbf0b2f','0fabe22d-e7e3-4380-a520-1c9e433a1405','1.0',NULL,'Y',NULL,'vfw','vfw','vfw','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c859e495-1df4-4613-8193-357defa1ec51','null','088d65a7-f6fb-4214-b5fb-f5fa6948a7d1','92f3786d-9aa7-413b-b751-e7a8595c7c22','1.0',NULL,NULL,NULL,'sm','sm','sm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c873746f-0a6e-422b-9efd-44aae71283a7','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c877c31e-896a-4f07-9c25-e5a447462ff5','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c8ab7283-5834-4c61-a165-c1e292711a59','null','1572dff4-d406-40ad-afd4-9828e66347a1','3da37bf6-87b4-4b98-a9a5-d2c18a7ab8ab','1.0',NULL,'Y',NULL,'vmt','vmt','vmt',NULL,'{}',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c935fb51-b144-4f95-804f-8c21e8ab3769','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c9527801-36a0-4fb3-a6ce-3c3e685283ab','null','86f39736-fe98-410c-b0a1-12baf7a64626','369abd2c-c79a-4ee3-9152-a158a8e160a9','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('c9f6627a-41c8-4805-8d30-74d755e3bd94','null','899ccf77-9926-47c5-9e96-7f32c7535455','5d660f11-702c-4875-b446-efaa631488c9','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('cb0fa12b-221c-41d3-b900-786711f5deba','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('cb751f30-9cd7-4c7f-999e-73c2691da482','null','945c23ea-ff66-45ef-937b-3847c69b45b0','7a4181d1-15e3-4a26-8b61-1881e18eb91a','1.0',NULL,'Y',NULL,'ralf','ralf','ralf',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('cc1fb9ba-e8d8-4544-b893-19784421da07','null','e55ea388-7c7a-4624-98d0-530b1cf12353','a6df5997-cae3-47bc-b11f-a8ae9ea15755','1.0',NULL,NULL,NULL,'microservices','microservices','microservices',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('cc2f9ba3-0a21-47cc-8e5c-d40b0b36b786','null','46359680-71dd-4c95-954d-70e1286003bc','b62b2cb6-cedb-4aa5-8501-d733dbad7546','1.0',NULL,NULL,NULL,'ps','ps','ps',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('cca81022-c403-46e3-a617-cf9d001532a1','null','c6a26e4e-4ba9-4abb-80c0-99af10e3e045','a7cf9a89-0b67-4247-bbfb-8fd671d0c13a','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('cd5501b1-1490-4b85-b954-8c3dcc641bf5','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('cdd0c29a-5067-4549-ac36-f437c64b79ed','null','e886bdeb-5486-4ecf-ad03-56837ab6e550','5e749085-6671-4472-a068-e9a974324c2a','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('cebe69d9-1c8e-45c0-9ab4-a0506c636d92','null','1172e0ac-8e56-4fdf-8454-18e2964e97de','440ce9b8-e1ba-4b63-918c-b433afb97d11','1.0',NULL,NULL,NULL,'app','app','app',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('cf16c622-b9e4-4712-924b-8008f47d84ef','null','b4df734b-f327-4552-adbd-51a844e6de90','8bbd2b3d-4b89-4270-b55f-4111fd14142d','1.0',NULL,'Y',NULL,'vdns','vdns','vdns','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('cf3e09d9-0a4c-4e54-9925-df317d9ac3ef','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('cf60de5e-1332-43fc-8640-a94b5013dea7','null','977529d3-aa9d-421c-aadd-fd0249d1a347','85c354fa-04bf-4ba7-8678-fad5d31d7a23','1.0',NULL,'Y',NULL,'vfw','vfw','vfw','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('cfa061e6-f6b5-4f2e-b605-f4cccf69a1ff','null','e53b0aae-f8b0-4776-bb40-837c5d48e289','87425303-683f-414d-a84e-1ce7534688d5','1.0',NULL,NULL,NULL,'sm','sm','sm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d014e9dd-284b-4baf-acaf-6caae88eaec1','null','5014d933-aa2f-4ea9-87f1-70729f080747','331d6f77-d90a-4c83-a11f-176ca9c901ab','1.0',NULL,NULL,NULL,'mmsc','mmsc','mmsc',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d01bd75c-4c1c-415d-9a8b-a48d50589089','null','0e2da292-c026-499e-978d-8a9912b8f3c3','50dd9a89-6184-40f1-8d61-3586369f647e','1.0',NULL,NULL,NULL,'be','be','be',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d057afa2-edab-4be3-93cb-89854e40c298','null','3b7a9ec3-7759-41fc-990e-e757dc4ccbbb','f89bd726-10f9-491c-a13f-7422933182dc','1.0',NULL,'Y',NULL,'vfw','vfw','vfw','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d05e773f-2d6c-4a8c-9ed9-e29eaaab7a10','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d0d264c5-eb08-416d-9e2f-d78649e3eb07','null','51e3f3de-b2c9-4cdb-9ed1-7d689d1df408','9e4c8069-d199-43ea-8eb3-ca1b5bb433d5','1.0',NULL,NULL,NULL,'fe','fe','fe',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d160bb89-8331-4f8f-b323-aadeaf6ad719','null','b35721e9-19aa-41db-bee4-0402887e5559','7e1199d9-34db-42a2-ada6-0bb45625b6fc','1.0',NULL,'Y',NULL,'dns','dns','dns',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d18761e1-1c7e-45b5-92d3-bf057164629b','null','87cb315b-4c0a-4c65-81a6-8221562f6a8e','0312fa13-5678-4ff7-b5ab-d2eb370cd44c','1.0',NULL,'Y',NULL,'app','app','app','USP_IECF-APP_30.3.3-mcas4.4.6.qcow2','nd.c12r4d50',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d1942b6f-5cfb-4167-a158-4a556d32d6fd','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d1c09e21-5074-4c80-9864-8bcdd3ef9d07','null','4ca1e003-d833-4bdc-877a-e4d7aeb6a4b7','2b6676c6-90b2-4d39-be19-b1ffbd23f558','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d2283908-05ea-4f6e-9e6a-c891f2df406f','null','039aeb04-d31a-48bd-9459-29539639d6ec','2bec9788-7039-4c59-aec1-35aae3903c19','1.0',NULL,NULL,NULL,'sm','sm','sm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d23cab29-da46-4aeb-b04d-3895f5ec3a76','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d2547357-4c45-4462-bc6b-46d640a4c1b8','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d25e12e3-8cf3-4fce-8fd2-bf21f0f0e795','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','852c4237-cfdd-4695-9e75-bcd4cf7d38a3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d2931a86-1b18-414c-a6f2-edd5cc1a26e9','null','1b9d7f98-60f9-476a-bd30-dc200fa89f93','0318d0e9-d938-4c4a-9157-848e5564f717','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d2e1e04b-0622-4624-868a-ff6a71b5adf3','null','c5993503-367f-4d34-901f-95fb562591fd','6ab10218-fb57-4423-b838-48efcec339a7','1.0',NULL,NULL,NULL,'conductor','conductor','conductor',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d330374c-aa93-4dfc-b4f4-a3dc4411b9aa','null','a3f9c583-bbfa-44a2-bc51-03f77a2bc8a7','8d63b561-50b8-44c9-a899-627687b6c930','1.0',NULL,'Y',NULL,'vmxvre','vmxvre','vmxvre',NULL,'ns.c1r16d32.v5',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d38f40ad-a4bd-4736-b324-486373898759','null','1e7d318b-f33b-4b90-9d75-6da7922361ed','35e68c56-72ff-43fc-892d-96164bd1f244','1.0',NULL,NULL,NULL,'pd_server','pd_server','pd_server',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d3afb81a-50f1-4e04-86de-7498741fcb62','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d44562b3-5960-474d-bfd3-e38bb638948c','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d48099b0-2b0a-4c5c-a2bd-aaf4727bb13d','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d486859c-c045-4216-a4a1-32901540ed1f','null','0ad0f610-74d9-4ddf-ad83-beca6203c3ce','87b6d27b-185e-419f-acfc-3f8bd659ce9c','2.0',NULL,NULL,NULL,'TEST_server','TEST_server','TEST_server','{}','{}',NULL,NULL,0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d4ceca44-046f-4a8c-bc8f-4e55b39be39a','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d4d60fbb-3af9-42f7-9da9-1fd955e5c086','null','83e2f5f6-c7ab-4f9f-be3e-3566dce5ca4a','f2e899b2-50df-4cb3-aa4b-2ffccad39e61','1.0',NULL,'Y',NULL,'vmxvre','vmxvre','vmxvre',NULL,'ns.c1r16d32.v5',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d4ee269d-563e-4b40-abc0-b9e831167253','null','00df4ead-6147-413b-8658-064bf60b45f4','ce27c3d9-e589-462e-aa30-f7aa0693cbfc','1.0',NULL,'Y',NULL,'iox','iox','iox','USP_IECF-IO_30.3.3-mcas4.4.6.qcow2','nd.c4r4d50',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d5a9f7ee-97bc-4f4c-a505-bcd49151fa80','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d5cbf388-721f-4e72-aeed-8eb087b54fdb','null','3c185a74-5a29-476d-a557-31af4c5e3ad6','34756e5d-c023-466f-a330-43c1e01a4491','1.0',NULL,NULL,NULL,'app','app','app',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d6aeb78d-9a31-494f-ab0e-936748eac20d','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d6f25bbc-9478-4885-b899-5cd6739557b3','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d7724722-c600-4a34-a813-3583d60a3776','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d77a5564-8dc8-492e-8d9b-2a93f6e6c8a3','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d7e69e58-c9b2-4480-8860-748656b693c1','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','7f26a2f8-3e6f-463d-8d7d-2a8fc36b2935','11.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d7ef089b-0fb6-4355-aef4-24bb33ad5d61','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d813efe8-c11f-415f-a7e7-4fbca9e92318','null','4354b220-90ef-4473-9d12-ce784891b4a7','4cdca75a-3f10-4658-ad63-4d30c6fab96c','1.0',NULL,'Y',NULL,'pps','pps','pps','NIMBUS_PCRF_11.0.0Base-ATTM1.0.0.qcow2','nv.c8r12d100',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d89ef92d-7708-473c-9843-151525428a3c','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d9023921-639c-4f29-bc39-75574e715492','null','40fa1c65-5db5-435c-8465-2ea98a49bfff','3bb7ef22-bd9f-4818-abb4-19c560e3661b','1.0',NULL,'Y',NULL,'vmxvpfe','vmxvpfe','vmxvpfe',NULL,'ns.c22r16d25.v5',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d921d8e0-72ef-4e82-9a5c-f8c524d9db72','null','25dbbc47-5077-4f3d-83d2-1f9900c66b40','c5212e4d-ac57-45a5-8dad-3ea5610a5700','1.0',NULL,'Y',NULL,'sprout','sprout','sprout',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d955ecf3-c37b-4829-a592-ed0c5dfac3db','null','86f39736-fe98-410c-b0a1-12baf7a64626','369abd2c-c79a-4ee3-9152-a158a8e160a9','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d9bb4581-b99a-4810-8bf7-2ddabf069573','null','63b30309-8d17-4a53-8a8e-d5c84dc67971','39962b65-2689-4dca-85d6-af29ac04af02','1.0',NULL,NULL,NULL,'plt','plt','plt',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('d9ee5ccc-acc3-4658-9068-e2d60942040d','null','d7820662-37e3-4dd5-9eee-ae4996eb9a49','7a5c7331-23ab-4230-bc73-ee12efed6831','1.0',NULL,'Y',NULL,'vdhcp','vdhcp','vdhcp','ubuntu-16-04-cloud-amd64','m1.medium',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('da276e91-0540-41d0-b6b2-f062e9ffea98','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('da32c96d-2f04-4548-8670-39ff222a3af4','null','34f12006-c7b5-4507-ba81-d5db0b0bd183','c630e7bf-4d84-4f2c-90c2-779d4e783bf8','1.0',NULL,'Y',NULL,'homestead','homestead','homestead',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('dac39219-5bbb-466a-8136-f2b3cd715957','null','4ee9e271-2073-4399-9779-0756f838f560','265e608e-9304-4996-91bc-2f2edb888a61','1.0',NULL,NULL,NULL,'ppd','ppd','ppd',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('daef9b68-c885-4fd9-905b-81d02287b400','null','7c072a5c-87da-43d6-a240-1bb4f5c48c8d','b158181f-e1da-43f3-89cd-41e8db24852a','1.0',NULL,NULL,NULL,'analyst','analyst','analyst',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('db207678-8018-4829-bec6-4143743b1a29','null','223db1a1-cc8c-4427-8e42-ae4307737c6c','a382c611-0f12-46bc-9316-520f36ffd641','1.0',NULL,'Y',NULL,'vsn','vsn','vsn','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('db6a3c01-6635-427c-b022-4826a6abcf38','null','fcec5e47-ce59-4541-bcd1-1115037bc77d','f76a36a2-9ffb-459d-8065-e022dbd04c17','1.0',NULL,NULL,NULL,'nems_fe','nems_fe','nems_fe',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('dbdcd5f1-014c-462c-a950-ba17813f9485','null','aafa741c-2d29-4896-8cc3-3a2edafe764b','365a1d85-0dad-4766-a1a0-34c91ce7901e','1.0',NULL,'Y',NULL,'sprout','sprout','sprout',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('dc82a28b-e06c-4362-b9a9-1a8536d11103','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('dcdb832d-6202-4b2d-a5c8-75eef953ebfb','null','4b2c0f45-4236-4219-b063-e2ca9c655af5','c8d403d0-3996-42e0-92b3-e26f3346f7f1','1.0',NULL,NULL,NULL,'psm','psm','psm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('dd6bb792-56c1-401a-957c-1494e42d059c','null','e2824f52-f71f-4dda-9e2d-9dd1c6163123','7495d002-4660-40e3-a834-b7bcaabeb7be','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ddb68a75-d9ac-4179-b00b-e5202eedb221','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('de5dad75-6519-42c9-b6fc-a73958971f26','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('de666e4b-8026-48ca-a753-4c8b6314edcf','null','f9cb9e26-f215-4d92-9686-c01d215c2370','e401c6be-3e29-4f6b-a9ff-dd289e15f3fd','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('df6167af-bf7a-46a0-a39c-b8e4834f2c70','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','852c4237-cfdd-4695-9e75-bcd4cf7d38a3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e011021c-1e17-4357-9390-138924d67df8','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e03f15f3-ecb9-4b34-ac1b-d33bab8cee2f','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e077e430-fdf1-4dc3-ae2d-ed02cb0534be','null','50696315-5bde-4a61-91c2-6fb9a47fb333','daf91cde-5b47-42c7-8b85-d18607ffe31f','1.0',NULL,NULL,NULL,'drbd','drbd','drbd',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e0894eed-1665-47ea-9bab-01d3d33b8a6a','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e0c44b72-4d57-4368-8f37-baa4bc507d53','null','86f39736-fe98-410c-b0a1-12baf7a64626','369abd2c-c79a-4ee3-9152-a158a8e160a9','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e10c30eb-e67f-49bc-a3b9-53ac87f5147c','null','d8e95546-60f7-4d74-9bc3-97326e57f9bf','d003593a-de80-4202-9a80-bc5338c679c4','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'nd.c4r8d0',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e1696594-145c-44aa-b2ff-3a3679ee9daf','null','607b0e02-9797-4251-b4af-7e25023653cd','8b3f7cec-61a7-4299-92c5-a0a0bda4aa7b','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e1d9a966-9f3c-48c6-8445-25faf6279e04','null','a2f315f2-5965-496c-aed6-7d3a3e3b9e93','b709e309-c645-4177-bb54-739b2d4c3fe3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e258f6b9-ab1a-4509-a5dd-14af510f39bf','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e2e2fee7-7f1b-4d05-bc71-0623bf4bca83','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e3119061-af71-4b1f-b2a7-6270561f89c4','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e319c3d2-4908-47c6-9d34-6167831748d5','null','a9d90156-8109-4a7f-af9e-bab39b0eb5ed','2dd777d8-0fa9-4a16-9d57-367c066398e9','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e3d8f89e-c5ec-46b1-9ed9-e09aee95397e','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e400273f-1161-43eb-8c06-e1b5eade4b5f','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e472f39e-2371-4dce-8b5e-883094836201','null','b4df734b-f327-4552-adbd-51a844e6de90','8bbd2b3d-4b89-4270-b55f-4111fd14142d','1.0',NULL,'Y',NULL,'vdns','vdns','vdns','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e479c112-5d01-4a10-af33-74f0f476ba05','null','72308d7a-5d2b-43d0-ab9d-1839fae15b63','f2c093f3-2f6d-46dd-880d-2831569cdaa9','1.0',NULL,'Y',NULL,'adm','adm','adm','{}','nv.c12r32d320s32',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e4bbdb28-c969-4f36-b071-9b2f93eccb78','null','86f39736-fe98-410c-b0a1-12baf7a64626','369abd2c-c79a-4ee3-9152-a158a8e160a9','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e4da2213-136c-4883-8dda-672b92574558','null','0d9310c0-238a-419c-9abf-a10c468f842b','60b3d723-a2af-427f-ae3a-c2626f860930','1.0',NULL,NULL,NULL,'par','par','par',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e53ac4a4-2f1d-4979-abe9-6fdd18024252','null','1ed55cb2-1569-4daa-8156-0c653a9a1bd2','97d74a37-0916-4de2-9f14-8a043228c4e8','1.0',NULL,NULL,NULL,'be','be','be',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e5fd954f-adcb-4675-b763-cc216bbe68b1','null','7b06461d-8692-40af-82bc-472696b91535','712bb2ce-878e-4758-a111-08db4d64ac30','1.0',NULL,'Y',NULL,'homer','homer','homer',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e63dfc74-a391-4dd1-b498-502deabad064','null','5de3f65a-9a57-463b-8f57-42307d9b27f8','900b6e33-ce13-46e8-b9e9-56d21e4a4668','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e6898721-cbc0-4d92-b356-e0e3c6cdb571','null','f9f13cd4-2c3c-4e4b-99eb-697877a83156','e0dad5f4-47b6-4973-8c3c-978ab29ac010','1.0',NULL,'Y',NULL,'app','app','app','USP_IECF-APP_30.3.3-mcas4.4.6.qcow2','nd.c12r4d50',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e6d3fdb1-8bc3-4312-9489-1e76c8efb4af','null','90a23913-8d7d-4272-b2d4-ebe81667cf17','9335c8ba-9677-4a88-b6cb-8078792b0974','1.0',NULL,NULL,NULL,'sm','sm','sm',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e7456fde-73be-44b6-97be-3cd6bd0e200a','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e755b80d-4779-439a-98e0-f322d2d70f5d','null','1f972070-da5e-45d4-b134-7f1dcd1e1848','854c5b98-6905-4ca1-a71c-23d0220c949a','1.0',NULL,NULL,NULL,'distributedlock','distributedlock','distributedlock',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e7678c43-dd5e-4a55-b58d-d58217d10292','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','852c4237-cfdd-4695-9e75-bcd4cf7d38a3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e77e6de3-e3a6-4579-b323-6ea911c5b3f0','null','5cc8a5cb-fc45-4ce0-8e95-6d221bd76d46','a5c14db7-eab9-4e7e-8dba-aa9421819132','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e7f9b901-b846-49eb-942b-9bf778a7d2c8','null','21949966-ca79-466a-a6c8-698ebd575aa4','0cdbc3a3-9462-4e74-a78b-c7618aff0b9e','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e821918b-15ea-4a78-8f7f-840bb3959ea1','null','5adbe212-db9f-4a6c-9871-226111051aa2','e7b9821a-fec2-4a9e-9213-badec9e4bd60','7.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e86fca77-08a7-4fea-8785-c4dbdbb221ad','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e9154076-fd6e-4cb8-8f27-8d95111c6c59','null','01cf04fe-b053-40b9-868e-0436453ee927','1f4f659f-5f6a-4e59-a8a8-c061579a5d01','1.0',NULL,NULL,NULL,'app','app','app',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e918ccc5-223a-4d8f-a6d1-73d3de95a6b3','null','3ca34c00-47ad-407b-8b31-d209843f7a07','a6a47256-5dad-44bb-afd3-a3dcb58b6493','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('e949e615-fadb-44a6-84df-f9f39864dbce','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ea133bc3-41e3-415d-a0b2-c65665d6e44e','null','5d8c005f-4a39-408f-9371-fd6dbb816d52','a9ac2bcc-09d7-495a-9fcf-f24e505f06ef','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ea3747eb-8a8e-4714-917c-63fd80ffe88c','null','52e18045-96d2-4150-940d-dfb0b8de5ad5','f16f1489-d1a9-4dba-b02d-43cbe052fcc6','1.0',NULL,NULL,NULL,'oam','oam','oam',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('eaa6a0ff-126e-491b-ae71-c66f305fb527','null','f9737450-54bd-4567-b8aa-bc41eff0907c','3a96d13f-ad83-4d66-9f09-49d348a1aa24','1.0',NULL,NULL,NULL,'pd_server','pd_server','pd_server',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('eafb6ec4-8870-4d6c-a6e8-b0865268427a','null','fbb05866-aa6a-4dd4-97f7-a20346d5f024','a1fa23a7-c5c6-493e-a1f0-981af15e337c','1.0',NULL,'Y',NULL,'psm','psm','psm','NIMBUS_PCRF_11.0.0Base-ATTM1.0.0.qcow2','nv.c6r96d100',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('eb386141-d1cd-418c-88d0-dd6769a73727','null','b793b557-d2ab-4d37-bda1-b897925c5aec','0a04f17d-b28b-435c-96d7-7bbe6c7072e5','1.0',NULL,NULL,NULL,'ps','ps','ps',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('eb653250-d8ab-419d-9b4a-eb0d283e3f84','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('eb73da35-bf2f-4b15-a6fc-4a8c7a81ea2e','null','aaa774f2-5100-4b89-9ffa-75ca47774f21','8081cb51-9c3d-4320-8f3b-9f5b8683f379','1.0',NULL,'Y',NULL,'ems','ems','ems',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('eb7edf17-9669-4a3f-8e4d-1a6c1d3e79cf','null','8b0ded4b-5f4f-41e9-a462-9d844dbd4e16','b3be0f48-049b-4eae-a438-469f98d3666a','1.0',NULL,'Y',NULL,'adm','adm','adm','{}','nv.c12r32d320s32',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ebe51ba8-e766-4aab-93c9-9dda409f6e84','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ed014da5-013d-4dea-9f77-f1399adfd0c6','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ed202651-4796-4cb4-94ca-382739d41dd4','null','503d60bc-0b02-4a46-8b3f-0d6efa355c6c','1e0ac2af-1887-46e5-adc9-4a6ded8e0b47','1.0',NULL,NULL,NULL,'pd','pd','pd',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ed8e372b-5893-4f81-ab4c-ad45e6f205b5','null','8d5acbcc-77b0-43ee-9775-8f4cd8fdf949','b50b4639-baf7-4472-9acc-fb576bc007e1','1.0',NULL,'Y',NULL,'xsa','xsa','xsa',NULL,'nd.c4r8d0',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ede8fba4-b7ff-4650-a711-6d6207c4b49b','null','f62862e2-1845-4dfa-b957-bc299928f375','14b6b533-f357-493d-a427-53e80dcf699f','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('eec51444-f917-4826-b6a8-e6221c7a90e4','null','c0738051-2a77-48a0-a0fa-dd5d5f8bcc31','2e67a45a-97ea-4e54-87a7-75c2f7ad9163','1.0',NULL,'Y',NULL,'vmxvpfe','vmxvpfe','vmxvpfe',NULL,'ns.c20r16d25.v5',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ef26a5a2-9e4e-42ff-bff4-0f194cb2d972','null','f2c4a5c4-d809-4d19-9c02-308b34e89794','65d44361-202b-4aeb-bf5d-ba318fc1f34d','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('efb0efd8-16c6-4e62-bd3f-522990dff760','null','3d101527-fe50-46e7-bd89-ad99e545d322','729e3ea2-d7e7-4a4f-9516-04bf6df59834','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('efb4a2b2-bc92-4d78-9ffb-bcece5d0ccaf','null','1db9da95-cd4d-4225-ac5a-e919f299989b','000ea3fe-76ca-4f10-9f7e-c65bbd597865','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('efc90207-24b1-47a1-928d-19350791ca47','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('efd437ed-2715-4fe4-a69a-eafc41e7f650','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f016575f-e7d9-4a90-aaf2-e6b429060fa8','null','bd670156-9175-4be4-9fde-09fb49dfac27','097276ed-bb83-4805-9cce-ceda0046fe8f','1.0','gw1218.Config_MS_VmVnfcNamingPolicyMobility1710.*','Y','Consumer Mobile DNS','dns','dns','dns',NULL,NULL,NULL,'{naming_policy=gw1218.Config_MS_VmVnfcNamingPolicyMobility1710.*, ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f0277eef-3729-4e66-8c72-a23f933c5c8f','null','504c87bd-4d99-4237-9ef5-823f659f153f','563300b6-3490-443f-acdc-a65b37a0d955','1.0',NULL,NULL,NULL,'cognoscdp','cognoscdp','cognoscdp',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f0606828-6ceb-497a-863d-b72c9d11fafd','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f0961049-966a-440f-af4c-797befaea852','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f148e42e-d310-464f-9a27-bf3bc7ed2202','null','616633f4-2f25-4d7f-915c-105d97ec1390','e5a4b18a-0f96-4a63-aa75-1b6245e5a98a','1.0',NULL,NULL,NULL,'dns','dns','dns',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f1f35cf8-0a4e-48c9-a966-513fcf4863f1','null','e96677f3-5e25-4981-ab2e-4717179460e4','87495082-054c-4c08-8701-a2daf1f39d61','1.0',NULL,NULL,NULL,'smp','smp','smp',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f219a42a-d5a6-4354-b072-259932ed8b48','null','16c726b8-c7fa-4479-8e7f-02eb6672fcee','ea2f1a09-26ea-4e3b-8534-8633cd98a5a3','1.0',NULL,'Y',NULL,'vdns','vdns','vdns','PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)','PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f2a5b03c-dca9-4152-b35e-95da0b2a42bd','null','db32aef7-2854-4c45-b54b-6a8ba9b2a187','9be0230e-8b41-472f-b116-c088031b6461','1.0',NULL,NULL,NULL,'ps','ps','ps',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f33b0238-a850-4b95-9078-2561fa509e04','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f39040ec-1feb-4a27-83e4-b5d3f184f896','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','852c4237-cfdd-4695-9e75-bcd4cf7d38a3','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f39128b6-1f38-4ca2-816b-3f15872de0bf','null','fb5f262a-269d-475c-bac2-31b009cdbe38','d5ac0c8f-4461-403b-aeb5-9b67f2ca7248','1.0',NULL,'Y',NULL,'ddc','ddc','ddc','{}','{}',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f4267340-601e-4040-ad87-f915e929a7fa','null','1aa31df4-439a-4dcc-b649-a7ed13510ab4','220a8d4f-d9e1-471e-8bc2-5c54d18de3c5','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f43ab7a9-ab7a-4720-9f98-5bb409f5d6e7','null','f2e36463-6fc4-474f-b99a-bdb244eeb4d0','983f0d97-0403-47e9-929a-f696cddeaccf','1.0',NULL,'Y',NULL,'vpg','vpg','vpg','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f4906bee-f14a-4d10-ac33-99043205b5db','null','231e7f44-fdbc-40a0-b836-c3302421004d','e66f3e27-27f7-450c-b3b7-cdaf43d262b6','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f4dd3fba-2106-4ba6-b834-b8876f072a3b','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f580e854-ac3d-49d1-b581-80b72f5a2c81','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f59f0b93-65da-4d01-bff6-50733cc8a9db','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f5b646e3-bdef-4f05-88e8-7f8cbb13d27e','null','11a268da-9a6e-4f39-8794-8de38f6cad63','6f48d61b-58fb-494e-9450-3497531e456d','1.0',NULL,NULL,NULL,'vvig','vvig','vvig',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f75bbdcd-d848-4a8e-ba4b-5173a7dcbb5a','null','75b03378-7319-418c-95e3-7a596ffa0c3b','b6f636f1-a834-4f24-a036-d0212a053688','2.0',NULL,NULL,NULL,NULL,NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f7b8a554-4335-45b8-bb61-c0a9b6f3d0ca','null','ea28c4ef-8200-4a97-b78c-c1e56f5089aa','198d7317-ad56-4cc3-9027-7a835f72e547','1.0',NULL,'Y',NULL,'rtp_msc_b','rtp_msc_b','rtp_msc_b',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f7d4ccaf-0f34-49e9-bb48-e652ca8a2705','null','72308d7a-5d2b-43d0-ab9d-1839fae15b63','f2c093f3-2f6d-46dd-880d-2831569cdaa9','1.0',NULL,'Y',NULL,'adm','adm','adm','{}','nv.c12r32d320s32',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f7dbd366-3e6f-4078-8f57-0ec005a42aee','null','aedc2b1d-2d46-419a-a100-f19acc5dda4c','b6de808d-1bf1-4445-9096-7184865b90c8','1.0',NULL,NULL,NULL,'guardian','guardian','guardian',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f84541f8-a56d-4ba6-8f2a-98bf872b4323','null','4788a442-db68-4d49-8086-80881e2ebcaa','c691c12d-4cd4-4f6f-8a8c-eb520242ec39','1.0',NULL,NULL,NULL,'rdn','rdn','rdn',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f8581354-8c0c-4199-9fc3-dcdf0ecef3d9','null','3ecec5d9-7517-4970-9977-242b02f6cc92','eccdf6a2-4ad6-456b-892e-7b4109308445','1.0',NULL,'Y',NULL,'vdns','vdns','vdns','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f88cf470-4821-4a8e-a088-9249eaf046b0','null','78bad803-6e0e-4d03-8c66-72bcc7181953','44463f30-180a-49af-837f-208aa4cf0a2a','1.0',NULL,'Y',NULL,'homestead','homestead','homestead',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f909049f-7457-40d2-83bc-e3a8ce282556','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('f9484812-fe80-4f5a-8428-538ddbca2586','null','5a4eaa4a-ae05-442a-8980-157ed29bcbc0','ae386fdd-e03e-46f1-98d4-013eb4cafa12','1.0',NULL,'Y',NULL,'vsn','vsn','vsn','PUT THE VM IMAGE NAME HERE (UBUNTU 1404)','PUT THE VM FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fa1a48a8-3939-4994-bc74-d57cc601e44a','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fa606398-23cc-49c2-94f0-92b2ab6a4bb8','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fb09a01b-249b-4038-bcf9-db20b0f206c9','null','4bdabf14-aef2-4def-8ee6-46efdf674a00','85d52cd1-8fc2-4b27-a42c-cb79c3acc1e7','1.0',NULL,'Y',NULL,'vlb','vlb','vlb','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fb29bfb6-5885-44d4-b792-c8bbf74127f9','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fbc1a5aa-361c-4ebf-838f-e50784d09fc9','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fc6d305f-4b2a-46c8-b2a6-e22ffa0c84e5','null','3c084584-265d-4191-b62b-a31cb4cdb239','eab27d98-6f01-4376-974d-2f602d08ec6d','1.0',NULL,'Y',NULL,'vlb','vlb','vlb','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fcaa6830-e5d2-4e51-8b2a-142ce5795ca9','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fcb6d888-d5ef-4955-9474-ef4deae1201e','null','aeacd56b-fba6-4a9d-a79a-4fd5e25da60a','e853bc40-4f19-4854-b096-45f3ab82c7e9','1.0',NULL,'Y',NULL,'homer','homer','homer',NULL,NULL,NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fe0adb9f-6a53-4f5f-814a-7fd4a1f94aff','null','dd3b80d2-2bd5-447e-a477-c545cb5f12a3','d5d27789-37b3-48f7-9938-7b013b2d79a8','1.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fe402490-fa32-48fa-9b64-c1be9feaeba8','null','28602f11-3e2a-4d19-8e0e-2f85a5256f69','9a3db35a-1416-4016-912a-afa57590ef6d','1.0',NULL,NULL,NULL,'eca_trx','eca_trx','eca_trx',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fe5506eb-2cab-49d0-98aa-3f6e7af62928','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fea5c677-4b8b-492f-a23d-665020923070','null','d10dcdb7-3f52-4303-a078-11d769ef33f4','c07f11c8-fccd-477c-bb70-5b7f939b3f08','3.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fee32e95-4d59-4fb6-bb30-88f63752400f','null','0ba8c32b-e413-494b-afe2-2b10ccfa5ee6','535e57f2-7913-4947-852a-dcd3a9020424','1.0',NULL,NULL,NULL,'nat_fw','nat_fw','nat_fw',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fef42f2f-7105-4d25-b5ea-d0488ba413b8','null','b8098e5a-a3eb-4758-a311-729fbcbaa8ee','5c712825-6389-4664-aeb0-0837faa5d9ad','1.0',NULL,NULL,NULL,'managementui','managementui','managementui',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('fef48cfb-de1f-4482-b6fc-72cd47fa0998','null','8b45ff14-14ca-4e2f-9ec5-2d957bc0ce93','b425cf93-ca33-41e6-ba92-ce78501ac44e','13.0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ff739f94-f33c-4a27-a84e-7ea813bf2e7c','null','1c2f2b6f-dadd-491e-b0bf-91eb8b97e524','d8ae78d3-880d-4a1a-a3af-64bd3077596b','1.0',NULL,NULL,NULL,'ps','ps','ps',NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('ff8f1549-c4cf-44b5-b8a3-884e1a586319','null','b6c6f2bb-729d-436a-80bb-29e8e1e1dfbe','ba095f9d-43f0-4842-b526-56e58a47516a','1.0',NULL,'Y',NULL,'vlb','vlb','vlb','PUT THE IMAGE NAME HERE (UBUNTU 1604)','PUT THE FLAVOR NAME HERE (m1.medium suggested)',NULL,'{ecomp_generated_naming=true}',0,NULL);
-INSERT INTO `VFC_MODEL` VALUES ('vnfapi-vfc-001',NULL,'vnfapi-invariant-vnf-001','vfc-001','v1','vfc-policy-001','Y',NULL,'vfc1','vlc','vlc',NULL,NULL,NULL,NULL,NULL,NULL);
-/*!40000 ALTER TABLE `VFC_MODEL` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Dumping data for table `VFC_TO_NETWORK_ROLE_MAPPING`
---
-
-LOCK TABLES `VFC_TO_NETWORK_ROLE_MAPPING` WRITE;
-/*!40000 ALTER TABLE `VFC_TO_NETWORK_ROLE_MAPPING` DISABLE KEYS */;
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1829,'fc6d305f-4b2a-46c8-b2a6-e22ffa0c84e5','default-network-role','vlb',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1830,'fc6d305f-4b2a-46c8-b2a6-e22ffa0c84e5','default-network-role','vlb','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1831,'fc6d305f-4b2a-46c8-b2a6-e22ffa0c84e5','default-network-role','vlb',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1832,'c16a5cd1-72ed-44b9-b4b0-fd0b8a8a3710','default-network-role','vdns','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1833,'c16a5cd1-72ed-44b9-b4b0-fd0b8a8a3710','default-network-role','vdns',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1834,'5a81616f-3b85-47f9-b3a6-43ddc9d705d1','default-network-role','vdns','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1835,'5a81616f-3b85-47f9-b3a6-43ddc9d705d1','default-network-role','vdns','vlb_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1836,'1d63438f-8683-481d-af5c-8a440ff6c86e','default-network-role','vpg',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1837,'1d63438f-8683-481d-af5c-8a440ff6c86e','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1838,'c8033d10-afbb-4310-b90b-abd4140c191f','default-network-role','vfw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1839,'c8033d10-afbb-4310-b90b-abd4140c191f','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1840,'c8033d10-afbb-4310-b90b-abd4140c191f','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1841,'28ff8b3e-486a-4f15-bcd8-5bab711d5c33','default-network-role','vsn','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1842,'28ff8b3e-486a-4f15-bcd8-5bab711d5c33','default-network-role','vsn',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1843,'e7f9b901-b846-49eb-942b-9bf778a7d2c8','default-network-role','vpg','unprotected_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1844,'e7f9b901-b846-49eb-942b-9bf778a7d2c8','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1845,'9166ff2f-23cb-4028-97e5-dc591fcfef3c','default-network-role','vdns','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1846,'9166ff2f-23cb-4028-97e5-dc591fcfef3c','default-network-role','vdns',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1847,'1782c476-7f94-4c01-9921-02459a6ce3cb','default-network-role','vlb',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1848,'1782c476-7f94-4c01-9921-02459a6ce3cb','default-network-role','vlb','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1849,'1782c476-7f94-4c01-9921-02459a6ce3cb','default-network-role','vlb',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1850,'75fabac4-56d8-4976-899f-0119543fd2b8','default-network-role','vdns','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1851,'75fabac4-56d8-4976-899f-0119543fd2b8','default-network-role','vdns','vlb_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1852,'0b221466-3962-42cd-b241-e08093869999','default-network-role','vpg',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1853,'0b221466-3962-42cd-b241-e08093869999','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1860,'023fcd99-b707-4084-81f2-5bc4c58a62fc','default-network-role','vgw','cpe_public',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1861,'023fcd99-b707-4084-81f2-5bc4c58a62fc','default-network-role','vgw','cpe_public',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1862,'023fcd99-b707-4084-81f2-5bc4c58a62fc','default-network-role','vgw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1863,'023fcd99-b707-4084-81f2-5bc4c58a62fc','default-network-role','vgw','onap_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1864,'023fcd99-b707-4084-81f2-5bc4c58a62fc','default-network-role','vgw','mux_gw_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1865,'023fcd99-b707-4084-81f2-5bc4c58a62fc','default-network-role','vgw','mux_gw_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1866,'bc5ce901-76a8-4516-b65d-26cec4ba463c','default-network-role','vpg','unprotected_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1867,'bc5ce901-76a8-4516-b65d-26cec4ba463c','default-network-role','vpg','unprotected_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1868,'bc5ce901-76a8-4516-b65d-26cec4ba463c','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1869,'bc5ce901-76a8-4516-b65d-26cec4ba463c','default-network-role','vpg','onap_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1870,'5130f20f-66c2-4ae5-8f93-bdb4ef857585','default-network-role','vfw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1871,'5130f20f-66c2-4ae5-8f93-bdb4ef857585','default-network-role','vfw','onap_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1872,'5130f20f-66c2-4ae5-8f93-bdb4ef857585','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1873,'5130f20f-66c2-4ae5-8f93-bdb4ef857585','default-network-role','vfw',NULL,0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1874,'5130f20f-66c2-4ae5-8f93-bdb4ef857585','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1875,'5130f20f-66c2-4ae5-8f93-bdb4ef857585','default-network-role','vfw',NULL,0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1876,'a9139e95-84ea-42d7-a4bb-a72b29a40970','default-network-role','vsn','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1877,'a9139e95-84ea-42d7-a4bb-a72b29a40970','default-network-role','vsn','onap_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1878,'a9139e95-84ea-42d7-a4bb-a72b29a40970','default-network-role','vsn',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1879,'a9139e95-84ea-42d7-a4bb-a72b29a40970','default-network-role','vsn',NULL,0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1880,'4795998e-8cd5-4b8f-ada9-fe9488392da8','default-network-role','vfw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1881,'4795998e-8cd5-4b8f-ada9-fe9488392da8','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1882,'4795998e-8cd5-4b8f-ada9-fe9488392da8','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1883,'1fc2d7f5-036f-4a77-b840-83277e76f13c','default-network-role','vsn','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1884,'1fc2d7f5-036f-4a77-b840-83277e76f13c','default-network-role','vsn',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1885,'bb69f2d4-be8a-400f-9d6d-6e9500664dbc','default-network-role','vpg',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1886,'bb69f2d4-be8a-400f-9d6d-6e9500664dbc','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1887,'cf60de5e-1332-43fc-8640-a94b5013dea7','default-network-role','vfw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1888,'cf60de5e-1332-43fc-8640-a94b5013dea7','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1889,'cf60de5e-1332-43fc-8640-a94b5013dea7','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1890,'db207678-8018-4829-bec6-4143743b1a29','default-network-role','vsn','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1891,'db207678-8018-4829-bec6-4143743b1a29','default-network-role','vsn',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1892,'54e98abe-743a-400d-809c-095644d92dd9','default-network-role','vpg',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1893,'54e98abe-743a-400d-809c-095644d92dd9','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1894,'aa999b75-51fd-451a-8556-c59e13cb3cd6','default-network-role','vlb',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1895,'aa999b75-51fd-451a-8556-c59e13cb3cd6','default-network-role','vlb','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1896,'aa999b75-51fd-451a-8556-c59e13cb3cd6','default-network-role','vlb',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1897,'f8581354-8c0c-4199-9fc3-dcdf0ecef3d9','default-network-role','vdns','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1898,'f8581354-8c0c-4199-9fc3-dcdf0ecef3d9','default-network-role','vdns',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1899,'bfbbab1c-b257-4ea9-81e0-416755b28df7','default-network-role','vdns','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1900,'bfbbab1c-b257-4ea9-81e0-416755b28df7','default-network-role','vdns','vlb_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1901,'66bc8dbf-26c6-4b12-9b87-c29b14cb1bac','default-network-role','vpg',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1902,'66bc8dbf-26c6-4b12-9b87-c29b14cb1bac','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1903,'ff8f1549-c4cf-44b5-b8a3-884e1a586319','default-network-role','vlb',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1904,'ff8f1549-c4cf-44b5-b8a3-884e1a586319','default-network-role','vlb','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1905,'ff8f1549-c4cf-44b5-b8a3-884e1a586319','default-network-role','vlb',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1906,'12cee19b-3c7e-4a61-9c3e-123702c6a2f5','default-network-role','vdns','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1907,'12cee19b-3c7e-4a61-9c3e-123702c6a2f5','default-network-role','vdns',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1908,'64508b50-a134-41d4-a957-ba40718dc250','default-network-role','vdns','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1909,'64508b50-a134-41d4-a957-ba40718dc250','default-network-role','vdns','vlb_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1910,'73c626ff-5b74-4f4f-a13a-a0998fa197e5','default-network-role','vpg',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1911,'73c626ff-5b74-4f4f-a13a-a0998fa197e5','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1912,'6be7deec-f93d-48ab-a6c4-ea844da22d0f','default-network-role','vfw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1913,'6be7deec-f93d-48ab-a6c4-ea844da22d0f','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1914,'6be7deec-f93d-48ab-a6c4-ea844da22d0f','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1915,'6163e3b4-ad26-4b16-a3cd-d0f3a3c66214','default-network-role','vsn','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1916,'6163e3b4-ad26-4b16-a3cd-d0f3a3c66214','default-network-role','vsn',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1917,'708364f6-83e5-40dd-a3cd-1903cda658f5','default-network-role','vpg',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1918,'708364f6-83e5-40dd-a3cd-1903cda658f5','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1919,'b4100ed9-507a-4be4-a456-0e49482a58ac','default-network-role','vfw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1920,'b4100ed9-507a-4be4-a456-0e49482a58ac','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1921,'b4100ed9-507a-4be4-a456-0e49482a58ac','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1922,'31b53e81-28c3-482e-842c-0ebd21053b59','default-network-role','vsn','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1923,'31b53e81-28c3-482e-842c-0ebd21053b59','default-network-role','vsn',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1924,'919ae940-5485-4270-9bb2-980213db6b95','default-network-role','vpg',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1925,'919ae940-5485-4270-9bb2-980213db6b95','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1926,'f219a42a-d5a6-4354-b072-259932ed8b48','default-network-role','vdns','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1927,'f219a42a-d5a6-4354-b072-259932ed8b48','default-network-role','vdns','cpe_public',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1928,'2b4c6ecd-2423-41ec-a8ff-ee4ecc05670d','default-network-role','vweb','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1929,'2b4c6ecd-2423-41ec-a8ff-ee4ecc05670d','default-network-role','vweb','cpe_public',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1930,'5418661d-07e1-403a-8caf-03f5442f2308','default-network-role','vaaa','cpe_signal',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1931,'5418661d-07e1-403a-8caf-03f5442f2308','default-network-role','vaaa','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1932,'652259eb-1b57-4f6e-8d22-6420a8261938','default-network-role','vdhcp','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1933,'652259eb-1b57-4f6e-8d22-6420a8261938','default-network-role','vdhcp','cpe_signal',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1934,'9f07ef60-6dea-4e20-b4d4-c78b1b8bda32','default-network-role','vbng','brgemu_bng_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1935,'9f07ef60-6dea-4e20-b4d4-c78b1b8bda32','default-network-role','vbng','bng_gmux_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1936,'9f07ef60-6dea-4e20-b4d4-c78b1b8bda32','default-network-role','vbng','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1937,'9f07ef60-6dea-4e20-b4d4-c78b1b8bda32','default-network-role','vbng','cpe_signal',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1938,'493be6dd-c307-4d84-bee4-2ed50e044f54','default-network-role','vbrgemu','vbrgemu_bng_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1939,'4440906c-a7e7-478b-a637-812999219fd1','default-network-role','vgw','cpe_public',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1940,'4440906c-a7e7-478b-a637-812999219fd1','default-network-role','vgw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1941,'4440906c-a7e7-478b-a637-812999219fd1','default-network-role','vgw','mux_gw_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1942,'bf9a909c-17ef-4a69-ac1f-56d05c53c528','default-network-role','vgmux','mux_gw_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1943,'bf9a909c-17ef-4a69-ac1f-56d05c53c528','default-network-role','vgmux','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1944,'bf9a909c-17ef-4a69-ac1f-56d05c53c528','default-network-role','vgmux','bng_gmux_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1945,'2b44c9db-28e1-45aa-b297-a4511d5317fe','default-network-role','vdns','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1946,'2b44c9db-28e1-45aa-b297-a4511d5317fe','default-network-role','vdns',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1947,'fb09a01b-249b-4038-bcf9-db20b0f206c9','default-network-role','vlb',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1948,'fb09a01b-249b-4038-bcf9-db20b0f206c9','default-network-role','vlb','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1949,'fb09a01b-249b-4038-bcf9-db20b0f206c9','default-network-role','vlb',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1950,'547126cc-f04f-458b-906a-ecb8463a058a','default-network-role','vdns','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1951,'547126cc-f04f-458b-906a-ecb8463a058a','default-network-role','vdns','vlb_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1952,'4dfadd90-d618-4c8d-b47d-60efebf6d01d','default-network-role','vpg',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1953,'4dfadd90-d618-4c8d-b47d-60efebf6d01d','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1954,'6e3b40fc-e28b-4158-ae96-fcdb901cb7f4','default-network-role','vfw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1955,'6e3b40fc-e28b-4158-ae96-fcdb901cb7f4','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1956,'6e3b40fc-e28b-4158-ae96-fcdb901cb7f4','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1957,'195f76ea-8256-4a07-b525-b40267c37b21','default-network-role','vsn','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1958,'195f76ea-8256-4a07-b525-b40267c37b21','default-network-role','vsn',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1959,'f43ab7a9-ab7a-4720-9f98-5bb409f5d6e7','default-network-role','vpg',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1960,'f43ab7a9-ab7a-4720-9f98-5bb409f5d6e7','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1961,'b8dd3ed9-cc4d-484a-af2c-0e18f4568fb3','default-network-role','vbrgemu','vbrgemu_bng_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1962,'b8dd3ed9-cc4d-484a-af2c-0e18f4568fb3','default-network-role','vbrgemu','vbrgemu_bng_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1963,'805be1fb-285d-4487-a9a2-223e995df5a4','default-network-role','vdns','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1964,'805be1fb-285d-4487-a9a2-223e995df5a4','default-network-role','vdns','onap_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1965,'805be1fb-285d-4487-a9a2-223e995df5a4','default-network-role','vdns','cpe_public',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1966,'805be1fb-285d-4487-a9a2-223e995df5a4','default-network-role','vdns','cpe_public',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1967,'25011296-744f-4cf6-80ed-476758829e90','default-network-role','vweb','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1968,'25011296-744f-4cf6-80ed-476758829e90','default-network-role','vweb','onap_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1969,'25011296-744f-4cf6-80ed-476758829e90','default-network-role','vweb','cpe_public',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1970,'25011296-744f-4cf6-80ed-476758829e90','default-network-role','vweb','cpe_public',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1971,'2435ffd0-cf02-4c82-a6df-655986b2518b','default-network-role','vaaa','cpe_signal',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1972,'2435ffd0-cf02-4c82-a6df-655986b2518b','default-network-role','vaaa','cpe_signal',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1973,'2435ffd0-cf02-4c82-a6df-655986b2518b','default-network-role','vaaa','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1974,'2435ffd0-cf02-4c82-a6df-655986b2518b','default-network-role','vaaa','onap_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1975,'d9ee5ccc-acc3-4658-9068-e2d60942040d','default-network-role','vdhcp','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1976,'d9ee5ccc-acc3-4658-9068-e2d60942040d','default-network-role','vdhcp','onap_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1977,'d9ee5ccc-acc3-4658-9068-e2d60942040d','default-network-role','vdhcp','cpe_signal',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1978,'d9ee5ccc-acc3-4658-9068-e2d60942040d','default-network-role','vdhcp','cpe_signal',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1985,'8be6b1e3-cfbb-4f62-8820-067bc784585d','default-network-role','vfw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1986,'8be6b1e3-cfbb-4f62-8820-067bc784585d','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1987,'8be6b1e3-cfbb-4f62-8820-067bc784585d','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1988,'98f311f9-39e0-4b96-be75-548fe6953247','default-network-role','vsn','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1989,'98f311f9-39e0-4b96-be75-548fe6953247','default-network-role','vsn',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1990,'c231d966-7c33-475b-b1da-6d8183a14f36','default-network-role','vpg','unprotected_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1991,'c231d966-7c33-475b-b1da-6d8183a14f36','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1992,'25d3be48-fc4b-453f-96de-97e07e6c18f5','default-network-role','vfw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1993,'25d3be48-fc4b-453f-96de-97e07e6c18f5','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1994,'25d3be48-fc4b-453f-96de-97e07e6c18f5','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1995,'377825eb-e83d-49b6-81ce-c99a0d30064e','default-network-role','vsn','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1996,'377825eb-e83d-49b6-81ce-c99a0d30064e','default-network-role','vsn',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1997,'37e7c1c1-d886-47e1-90a8-f907fcb312c3','default-network-role','vpg',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1998,'37e7c1c1-d886-47e1-90a8-f907fcb312c3','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (1999,'267d9b14-e8e3-4fcc-9cbd-da3d1b6ae843','default-network-role','vfw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2000,'267d9b14-e8e3-4fcc-9cbd-da3d1b6ae843','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2001,'267d9b14-e8e3-4fcc-9cbd-da3d1b6ae843','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2002,'bffb18fa-e09f-4d2e-9a56-6f032e03ac19','default-network-role','vsn','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2003,'bffb18fa-e09f-4d2e-9a56-6f032e03ac19','default-network-role','vsn',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2004,'08559203-1f1e-4424-ac5f-6ec24bb8bf6d','default-network-role','vpg','unprotected_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2005,'08559203-1f1e-4424-ac5f-6ec24bb8bf6d','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2006,'c5a89a5b-e5bb-47eb-a382-b46cfe8adf5e','default-network-role','vbng','brgemu_bng_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2007,'c5a89a5b-e5bb-47eb-a382-b46cfe8adf5e','default-network-role','vbng','brgemu_bng_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2008,'c5a89a5b-e5bb-47eb-a382-b46cfe8adf5e','default-network-role','vbng','bng_gmux_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2009,'c5a89a5b-e5bb-47eb-a382-b46cfe8adf5e','default-network-role','vbng','bng_gmux_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2010,'c5a89a5b-e5bb-47eb-a382-b46cfe8adf5e','default-network-role','vbng','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2011,'c5a89a5b-e5bb-47eb-a382-b46cfe8adf5e','default-network-role','vbng','onap_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2012,'c5a89a5b-e5bb-47eb-a382-b46cfe8adf5e','default-network-role','vbng','cpe_signal',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2013,'c5a89a5b-e5bb-47eb-a382-b46cfe8adf5e','default-network-role','vbng','cpe_signal',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2020,'30969396-fa5a-4faf-9163-db6484e54e59','default-network-role','vpg','unprotected_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2021,'30969396-fa5a-4faf-9163-db6484e54e59','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2022,'3b08d0cb-3f1c-4178-8dab-bf7b85782f00','default-network-role','vfw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2023,'3b08d0cb-3f1c-4178-8dab-bf7b85782f00','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2024,'3b08d0cb-3f1c-4178-8dab-bf7b85782f00','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2025,'98608c67-9b1a-4160-849c-060171c0ae16','default-network-role','vsn','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2026,'98608c67-9b1a-4160-849c-060171c0ae16','default-network-role','vsn',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2027,'13ec94e1-b04c-4fd1-99e6-c982020e453f','default-network-role','vfw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2028,'13ec94e1-b04c-4fd1-99e6-c982020e453f','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2029,'13ec94e1-b04c-4fd1-99e6-c982020e453f','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2030,'416b75a7-32ea-458c-95fe-c14854d618ca','default-network-role','vsn','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2031,'416b75a7-32ea-458c-95fe-c14854d618ca','default-network-role','vsn',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2032,'1203cf96-76de-4325-bb58-0053f1c6ddb1','default-network-role','vpg',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2033,'1203cf96-76de-4325-bb58-0053f1c6ddb1','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2034,'8b84aeae-51cf-48c2-8bb1-50c7aa444a16','default-network-role','vgmux','mux_gw_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2035,'8b84aeae-51cf-48c2-8bb1-50c7aa444a16','default-network-role','vgmux','mux_gw_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2036,'8b84aeae-51cf-48c2-8bb1-50c7aa444a16','default-network-role','vgmux','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2037,'8b84aeae-51cf-48c2-8bb1-50c7aa444a16','default-network-role','vgmux','onap_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2038,'8b84aeae-51cf-48c2-8bb1-50c7aa444a16','default-network-role','vgmux','bng_gmux_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2039,'8b84aeae-51cf-48c2-8bb1-50c7aa444a16','default-network-role','vgmux','bng_gmux_private',0,0,NULL,'N',NULL,'6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2040,'e472f39e-2371-4dce-8b5e-883094836201','default-network-role','vdns','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2041,'e472f39e-2371-4dce-8b5e-883094836201','default-network-role','vdns',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2042,'22245ea3-605f-4a9f-94b9-cf39ef7f3c0e','default-network-role','vlb',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2043,'22245ea3-605f-4a9f-94b9-cf39ef7f3c0e','default-network-role','vlb','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2044,'22245ea3-605f-4a9f-94b9-cf39ef7f3c0e','default-network-role','vlb',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2045,'cf16c622-b9e4-4712-924b-8008f47d84ef','default-network-role','vdns','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2046,'cf16c622-b9e4-4712-924b-8008f47d84ef','default-network-role','vdns','vlb_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2047,'61ac4ca1-9516-43c8-ab0e-d869e3d5d011','default-network-role','vpg',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2048,'61ac4ca1-9516-43c8-ab0e-d869e3d5d011','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2049,'22c63259-70c3-4d19-8f75-47ebef517be4','default-network-role','vfw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2050,'22c63259-70c3-4d19-8f75-47ebef517be4','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2051,'22c63259-70c3-4d19-8f75-47ebef517be4','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2052,'61a24df6-cde4-4d83-ae28-ed1f60e85381','default-network-role','vsn','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2053,'61a24df6-cde4-4d83-ae28-ed1f60e85381','default-network-role','vsn',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2054,'bfd5e865-92a4-45a1-888d-ba7c2497ad50','default-network-role','vpg',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2055,'bfd5e865-92a4-45a1-888d-ba7c2497ad50','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2056,'d057afa2-edab-4be3-93cb-89854e40c298','default-network-role','vfw','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2057,'d057afa2-edab-4be3-93cb-89854e40c298','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2058,'d057afa2-edab-4be3-93cb-89854e40c298','default-network-role','vfw',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2059,'f9484812-fe80-4f5a-8428-538ddbca2586','default-network-role','vsn','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2060,'f9484812-fe80-4f5a-8428-538ddbca2586','default-network-role','vsn',NULL,0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2061,'63227786-48c6-4e70-a229-64a4dd79d8c4','default-network-role','vpg','unprotected_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO `VFC_TO_NETWORK_ROLE_MAPPING` VALUES (2062,'63227786-48c6-4e70-a229-64a4dd79d8c4','default-network-role','vpg','onap_private',0,0,'N',NULL,'4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-/*!40000 ALTER TABLE `VFC_TO_NETWORK_ROLE_MAPPING` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Dumping data for table `VF_MODEL`
---
-
-LOCK TABLES `VF_MODEL` WRITE;
-/*!40000 ALTER TABLE `VF_MODEL` DISABLE KEYS */;
-INSERT INTO `VF_MODEL` VALUES ('02328586-9428-4655-ba74-b07ec04b87b8','null','878a7207-457f-4397-875c-2960790cc45d','6ba0507d-0cc0-49b7-9f7d-14b77208a91d','1.0','20066c20-7e1c-4c6c-ad35',NULL,'Y',1,NULL,NULL,NULL,NULL,'a846d6ba-f144-4f23-a618','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('050cb7c0-3c3e-418d-b08d-3c58fd11fa55','null','eccb19dc-ea1d-438f-9fdd-639a7e715f52','9ad0a466-446e-47ec-a193-03644a0440b8','1.0','d42ff177-2274-4e2c-ab72',NULL,'Y',1,NULL,NULL,NULL,NULL,'e6f60590-3d68-4657-baef','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('0a534cd4-6b40-4294-8a3c-411db2180e0c','null','740ea8c7-17ba-4584-ac37-816cb64e2500','3d0d5075-7e0e-4965-a964-b808f159d063','1.0','vcpevsp_infra_0412',NULL,'Y',1,NULL,NULL,NULL,NULL,'integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('0a8170be-6630-473e-a281-72bb8c5073c1','null','77144646-7def-4ae3-9eeb-cf6db0a4f940','c1130d82-dbdf-480b-9dfe-59e92c731acd','1.0','02337616-7925-4c29-a084',NULL,'Y',1,NULL,NULL,NULL,NULL,'c1536ceb-24bf-45ef-9298','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('11a6cd75-91a6-47bc-aeed-75a27db27357','null','872a9bde-6d3f-4e81-8ba3-29e952013694','d996dbf4-036e-42c0-aa1c-e7d7918e160b','1.0','44353c56-dcc6-4abd-ba5f',NULL,'Y',1,NULL,NULL,NULL,NULL,'311201a8-87ed-4a48-b9dd','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('1308b712-e956-4678-bbb4-95bb053719fb','null','3e8c0291-3367-4fbe-a7c6-50e1c6956a8d','2841744d-b8e5-467b-b1f9-438168db6c3b','1.0','vIMSVSP20180608',NULL,'Y',1,NULL,NULL,NULL,NULL,'00992ad9-cada-4520-84aa','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('13432bde-f701-4c8d-9962-d4325c60d466','null','0cf78904-45e6-4e6a-8e9e-683429f99c85','0c8109b5-7d77-49d3-9165-8a5f5133622a','1.0','f8ed27d1-03f6-45cb-9d7f',NULL,'Y',1,NULL,NULL,NULL,NULL,'d5cbb80e-fe54-474b-aeff','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('136ca73b-ac72-4734-8236-13304e9aed60','null','b3dc6465-942c-42af-8464-2bf85b6e504b','ba3b8981-9a9c-4945-92aa-486234ec321f','1.0','vcpevsp_vgmux_0412',NULL,'Y',1,NULL,NULL,NULL,NULL,'integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('1b8908b1-0af7-4fa2-980d-a43bc85ef8f5','null','176f26ba-9bf8-46b6-b54d-53cd0c14183d','d848e8a2-5360-445a-b98d-6f3d2a787dc5','1.0','vcpear_tunnelxconn_0412a',NULL,'Y',1,NULL,NULL,'TunnelXConn','TunnelXConn','integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('23219762-d5d8-48aa-b8e7-674878f16d98','null','c1aff822-c464-474c-a56b-d64f7442fd10','3a519696-4606-4996-8544-649a40bb403a','1.0','cd78de6e-0e49-4503-8de5',NULL,'Y',1,NULL,NULL,NULL,NULL,'c11d4b2e-f8fe-448e-bc82','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('24b7a42c-43a2-459a-8c0b-14cfe2983078','null','35b259b6-d367-4e2d-bd79-dd6ec0740e2e','603377e1-2058-44ac-81cb-ce44e7f7972d','1.0','91e8ae5e-f191-4512-865a',NULL,'Y',1,NULL,NULL,NULL,NULL,'8ae7758e-6682-4c18-b886','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('25c0e63a-62be-45da-9cb3-37e244fcf664','null','48d5645b-2b71-4854-ba2f-cca3d4c96f05','79e9ee95-cdb9-4e22-9daa-35dcfb0b949c','1.0','vPacketGen-test',NULL,'Y',1,NULL,NULL,NULL,NULL,'marco','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('28978eea-6b39-497a-9ee8-ce2f92159235','null','19c5417a-fead-41f2-a29e-c1bd7593601f','5cd256a5-64a5-46cf-bc8f-4131533cc8e2','1.0','vcpear_brg_0412a',NULL,'Y',1,NULL,NULL,'BRG','BRG','integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('2a1eb839-b3c6-40f9-b7c1-efb3b26c70dc','null','b3dc6465-942c-42af-8464-2bf85b6e504b','ba3b8981-9a9c-4945-92aa-486234ec321f','1.0','vcpevsp_vgmux_0412',NULL,'Y',1,NULL,NULL,NULL,NULL,'integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('2af2bbbe-63d7-49ca-be71-90e55a813a99','null','b8937bf5-6a09-46ae-894a-c0637c21f796','8127d692-4150-400a-afba-220682fca4a6','1.0','5cba334e-f675-4e7b-bdca',NULL,'Y',1,NULL,NULL,NULL,NULL,'bcd5e1f3-59e4-479b-9860','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('2f3b6df7-1c81-46f7-b5ef-2529627e6417','null','006912bd-83e4-4c82-8133-4ca48d26351d','b988526d-2743-4c98-902b-7ed8ecbc7dd4','1.0','91ae7763-9640-44db-9741',NULL,'Y',1,NULL,NULL,NULL,NULL,'0a7a8936-cf4b-4b9b-b9d9','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('35803e11-0a26-4d3c-9056-17371c038f0f','null','b3dc6465-942c-42af-8464-2bf85b6e504b','ba3b8981-9a9c-4945-92aa-486234ec321f','1.0','vcpevsp_vgmux_0412',NULL,'Y',1,NULL,NULL,NULL,NULL,'integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('366e9c64-caf3-46d5-a849-61695400be91','null','bf28c330-ea31-420d-a251-e188aa60ba3a','b7c0d9bf-049e-46ab-9293-8801e0a338bf','1.0','vIMSVSP20180608b',NULL,'Y',1,NULL,NULL,NULL,NULL,'00992ad9-cada-4520-84aa','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('3803bf29-c913-4f7b-9483-1dfef28e1d78','null','b3dc6465-942c-42af-8464-2bf85b6e504b','ba3b8981-9a9c-4945-92aa-486234ec321f','1.0','vcpevsp_vgmux_0412',NULL,'Y',1,NULL,NULL,NULL,NULL,'integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('3ab10178-2307-4779-993b-d8d916642770','null','63d62772-d133-4237-85c9-3fe0bb9d1e3d','e07555fb-90fb-4a49-80df-82083e6c9fb2','1.0','vFirewall-test',NULL,'Y',1,NULL,NULL,NULL,NULL,'marco','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('3bc3c7fb-2aa2-485c-be1f-cdbba0409252','null','8ec6af7c-722a-4bb8-bc03-fefd95701b95','46a14e4e-046f-4b4f-a709-720c2cf294fc','1.0','vcpevsp_vgw_0412',NULL,'Y',1,NULL,NULL,'vGW','vGW','integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('3bf1f25c-6120-4b26-9208-2e14e8093287','null','2d434620-6804-41a3-81ed-070b4fdc80d3','23b52494-a020-4f24-8aaa-928c770a312d','1.0','411213cf-2ef7-4baf-937f',NULL,'Y',1,NULL,NULL,NULL,NULL,'57769652-ba3b-44b8-aea8','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('3df5fb34-6c7c-4f8e-b5d2-e870c39e2a2a','null','72e4175b-2ff5-450e-8682-5d914da139b6','1cb4c849-dfc6-46cd-b51e-115f12fe949a','1.0','db936876-875a-4b76-a63a',NULL,'Y',1,NULL,NULL,NULL,NULL,'88d88c5e-b523-4f95-bda9','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('497101aa-128a-4212-b1bc-4acc4ef55f39','null','af3c7a82-93ab-4c59-a1b8-3942fd9003cc','937577ab-a130-47eb-be8c-9b147645c07f','1.0','5b544259-d509-4de2-8f6b',NULL,'Y',1,NULL,NULL,NULL,NULL,'801b3622-9df2-41c0-b5ed','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('4a60ae92-57ac-447a-b24e-67fc0d59e232','null','4a6cb9bd-8a5b-4a74-b014-e8eb31d9aff0','711b6b74-0970-415e-8111-e307748d4e1e','1.0','f4e99124-b49f-415c-89c4',NULL,'Y',1,NULL,NULL,NULL,NULL,'30865633-d5c2-4571-bb21','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('4d1b6ce4-cd7e-42ce-bdf4-173710ebd53c','null','3161f1e7-5d66-4797-86ea-5d4e0ad1abac','ff0c0a5f-7bb5-43d4-98b2-919351e62058','1.0','vIMSVSP20180608a',NULL,'Y',1,NULL,NULL,NULL,NULL,'00992ad9-cada-4520-84aa','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('5525dd38-b185-4ef1-aa66-6e96d0437f0b','null','67cf04b1-14f4-4210-93e5-cd3cf2f3d2fe','52926239-bb9e-4211-b2bb-8f7e73c7ffad','1.0','842ab74b-ba7d-431f-955c',NULL,'Y',1,NULL,NULL,NULL,NULL,'40c66297-aea9-463f-997e','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('5724fcc8-2ae2-45ce-8d44-795092b85dee','null','b3dc6465-942c-42af-8464-2bf85b6e504b','ba3b8981-9a9c-4945-92aa-486234ec321f','1.0','vcpevsp_vgmux_0412',NULL,'Y',1,NULL,NULL,NULL,NULL,'integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('59d0a2ee-dd09-4fd7-866f-acaa739855bc','null','b3dc6465-942c-42af-8464-2bf85b6e504b','ba3b8981-9a9c-4945-92aa-486234ec321f','1.0','vcpevsp_vgmux_0412',NULL,'Y',1,NULL,NULL,NULL,NULL,'integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('699b2861-22f0-4a32-8497-1d373b7c85f8','null','54f69a75-7add-4be5-ade9-44bfe6c4ef71','5918eca3-5e4c-4a5b-9231-6a60b96cab5a','1.0','b4f764be-4b65-41b5-a8b5',NULL,'Y',1,NULL,NULL,NULL,NULL,'2d8b2abb-b313-4dec-8ed1','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('6e52d51a-1d5a-4dfd-ab69-dac16784e620','null','8fb3d57e-3889-4c8f-ba30-d20d02e0aa4d','bf2b4d3c-d07a-47de-8fa6-6b7ad6edd0cf','1.0','b40a75f9-8943-429b-8f59',NULL,'Y',1,NULL,NULL,NULL,NULL,'ebbecfe5-96c4-44ca-af00','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('7236afdf-903f-43c3-969d-3c99643787ea','null','31be6f4c-4793-49af-bb2a-4869936f3868','466d99e6-3e6a-4073-939e-242fa4dc2d7b','1.0','vcpevsp_vbrg_0412',NULL,'Y',1,NULL,NULL,NULL,NULL,'integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('73379cc8-4cd2-49bb-a3b5-e3e38693aafc','null','63d62772-d133-4237-85c9-3fe0bb9d1e3d','e07555fb-90fb-4a49-80df-82083e6c9fb2','1.0','vFirewall-test',NULL,'Y',1,NULL,NULL,NULL,NULL,'marco','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('7b708ab0-1d4c-472c-9822-a7d020c4fecf','null','48d5645b-2b71-4854-ba2f-cca3d4c96f05','79e9ee95-cdb9-4e22-9daa-35dcfb0b949c','1.0','vPacketGen-test',NULL,'Y',1,NULL,NULL,NULL,NULL,'marco','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('80bc8335-145b-4b42-9408-d450358f1bab','null','02e9ca0a-8043-4bf6-80e8-e2d3cec23e29','96f065f6-fe4f-4163-aded-d25bfd69426d','1.0','14b9172f-c34c-493f-8531',NULL,'Y',1,NULL,NULL,NULL,NULL,'7ccfd50d-304c-4a10-a696','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('86c1f2b6-a2b5-44cc-97d3-ae29366ac2b1','null','bdde7265-5fc0-4130-8779-4abccf306c09','113cd212-af51-4b98-ad07-14ef3abbff83','1.0','becdb9c0-1855-4f1b-bc0d',NULL,'Y',1,NULL,NULL,NULL,NULL,'0ce7fa73-7a42-43b9-9c41','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('8757a5ba-4c80-4de3-8c61-5fe136bd02be','null','6f5fc5e6-5126-48c2-962d-d6a8336cf38c','90102bff-1096-4e84-946c-c6c865f15036','1.0','vIMSVSP20180607',NULL,'Y',1,NULL,NULL,NULL,NULL,'00992ad9-cada-4520-84aa','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('8892322d-8797-4ecd-a4b1-bf0cdc426541','null','176f26ba-9bf8-46b6-b54d-53cd0c14183d','d848e8a2-5360-445a-b98d-6f3d2a787dc5','1.0','vcpear_tunnelxconn_0412a',NULL,'Y',1,NULL,NULL,'TunnelXConn','TunnelXConn','integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('8ad76346-0545-4c65-a54c-8bcd62c8d7f6','null','52f8a7ed-190e-49f8-bb24-8944027a92f5','cf4ad538-318d-46ee-81d9-5f8d006e3606','1.0','vLoadBalancerMS',NULL,'Y',1,'nf-function',NULL,'nf-test','nf-role','marco','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('8cd3bf7d-6771-454d-bdf0-dfd36986c1b8','null','a8ed6a85-b562-4059-a077-fcceb1f863dd','cf00b5dd-bb26-48ac-8a99-e746643c8a02','1.0','53b57349-8c94-4ce0-8409',NULL,'Y',1,NULL,NULL,NULL,NULL,'5bc39f51-5239-4cca-be3c','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('8d495df7-47c8-4971-91d1-b93de4ed2f40','null','4347dec1-a6d5-4065-9100-cf8296c186a3','43434401-02e0-4fad-95ee-0032d7cade67','1.0','a71318f4-c1e0-47bc-a79f',NULL,'Y',1,NULL,NULL,NULL,NULL,'3b22648b-83b2-45cf-8395','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('92725868-e2c5-4dcf-b7dc-e14a8815bcc9','null','e819628d-b462-429a-bc5f-77dc49eb3a4c','339355fa-3a84-4ee2-91f0-ff0d406148c3','1.0','73e99e25-866d-41b3-9a0b',NULL,'Y',1,NULL,NULL,NULL,NULL,'0d6b89df-0911-4925-bd06','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('9b14a452-4107-459c-abab-f485ea5ab93c','null','8ec6af7c-722a-4bb8-bc03-fefd95701b95','46a14e4e-046f-4b4f-a709-720c2cf294fc','1.0','vcpevsp_vgw_0412',NULL,'Y',1,NULL,NULL,'vGW','vGW','integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('9cb3fa20-501b-4d82-a03e-43c31113c5fb','null','a8a601e4-e472-47df-92f2-c599ef48d550','35aba391-9e49-47a9-afd4-8c5c74a6a983','1.0','70085862-aac3-4d55-8c5b',NULL,'Y',1,NULL,NULL,NULL,NULL,'d77b87c0-d52e-4d41-89f8','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('9cd59c5c-9856-4376-9331-71b390f5691a','null','81704114-d85f-4cf9-8682-acc747bb12f3','49e9ae79-f2ef-47bc-aaa7-4830b90e73e0','1.0','vcpevsp_vbng_0412',NULL,'Y',1,NULL,NULL,NULL,NULL,'integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('9f5855de-b9fb-4b14-8bce-1868da9d72aa','null','909921a8-c227-450c-9bf3-3b72ac583270','52645596-cc19-47e2-95c9-bf636de3ec91','1.0','239c684f-22b0-42c0-9a82',NULL,'Y',1,NULL,NULL,NULL,NULL,'472b477f-3e2f-41b0-82fd','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('a2aa0335-3241-4f03-a902-17f309fe479c','null','e202f844-3fd8-4e79-a6e3-855060e246e2','07a9e92c-2d47-4fa3-8589-39b5cc50e500','1.0','48fb028c-cafb-460e-a193',NULL,'Y',1,NULL,NULL,NULL,NULL,'1a0cb087-4efc-4e74-bd2a','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('bb2eb27e-9591-491a-b35a-3aa0e9cc57b9','null','45c7e8aa-9512-4c78-8e27-e509b90ab6a0','70c357be-23df-4800-b411-6a013aa7d092','1.0','5fd14647-93a0-4a65-aea4',NULL,'Y',1,NULL,NULL,NULL,NULL,'52a2cdc1-a31a-4910-944e','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('bc28ccc5-7685-449f-a41b-4021734f58da','null','4efca684-133b-4c07-b722-41dd83ff8b23','13c16e38-0dc6-4d7c-bcdf-18d1372ef9d5','1.0','d3e133c2-8b6b-4d29-bfe2',NULL,'Y',1,NULL,NULL,NULL,NULL,'647216c9-037c-4f1d-9e2d','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('bcfd6cff-219b-4dea-8c9b-e25541e72827','null','bab4446a-bcbf-4ba1-b53a-0c901d7f898f','5b552231-29db-4dcd-b741-ba61e3b5be54','1.0','68835bb3-c82a-49a9-b2f1',NULL,'Y',1,NULL,NULL,NULL,NULL,'59de9b6f-2949-44d7-8bd1','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('c94127c3-d59a-4cf3-8a6a-a1a148a9d21f','null','1c0d6b49-77c3-4558-94f0-1f8631ca9add','7eb8eca5-f56d-4df0-8e2e-4de55b79d287','1.0','d76b67fa-aa0d-40ad-9080',NULL,'Y',1,NULL,NULL,NULL,NULL,'64017fa2-e3cc-43a5-bd44','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('cb8f6ccd-c8b7-4169-a7de-9e0a69457783','null','a6dd6248-9024-43e1-863a-4d8fafa6f7c3','615953e0-beb9-4e86-b7a0-e10f25a30256','1.0','1d7c4a86-1638-4fd2-a750',NULL,'Y',1,NULL,NULL,NULL,NULL,'e9a30e94-64df-41f4-b66f','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('cc1e0245-fd9c-407a-9199-bcfa247d7718','null','19c5417a-fead-41f2-a29e-c1bd7593601f','5cd256a5-64a5-46cf-bc8f-4131533cc8e2','1.0','vcpear_brg_0412a',NULL,'Y',1,NULL,NULL,'BRG','BRG','integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('d207b1b6-a439-412a-8a4e-b1aef0db6c57','null','a06fd52a-af17-45d0-b441-a5b7b7fb833c','3e0f1e26-da8c-42aa-b4b2-c527602b702f','1.0','2542ad5c-0c1d-4793-adf1',NULL,'Y',1,NULL,NULL,NULL,NULL,'80032dae-ba84-4d59-83f3','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('d7cf16df-fe97-4aee-9b9e-9c27f89b5610','null','b3dc6465-942c-42af-8464-2bf85b6e504b','ba3b8981-9a9c-4945-92aa-486234ec321f','1.0','vcpevsp_vgmux_0412',NULL,'Y',1,NULL,NULL,NULL,NULL,'integration','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('df759ce2-10a2-4504-aef4-2e9111c26c7a','null','98ed1423-e14e-4a8a-aa87-56e4c068b8c7','69ec3916-4868-4bdd-983b-b04bc1e468ff','1.0','e689be09-2a39-4c62-8c06',NULL,'Y',1,NULL,NULL,NULL,NULL,'59d35d1b-bfc7-44ec-8c72','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('e99fe1c3-c970-4ab4-82a3-33a2289829f5','null','e3ff01db-57de-431f-b683-6ad0fe668955','be76ab25-6842-49a6-a6e5-7b3b80ebb811','1.0','45604a78-d4a8-4adc-9b35',NULL,'Y',1,NULL,NULL,NULL,NULL,'dad19bb7-6ae6-42dd-8b4c','1.0',NULL,NULL,NULL);
-INSERT INTO `VF_MODEL` VALUES ('eaddf06d-4a85-4919-bf9a-ded1c48493ca','null','aa0c416f-ac0f-49b5-b5f9-3739ae3f2753','eeb90b63-e4ca-4ddb-9b4a-2b0b125bfbfe','1.0','2c75c3e7-526d-41f7-b0f1',NULL,'Y',1,NULL,NULL,NULL,NULL,'90277d8e-fd79-460a-85a2','1.0',NULL,NULL,NULL);
-/*!40000 ALTER TABLE `VF_MODEL` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Dumping data for table `VF_MODULE_MODEL`
---
-
-LOCK TABLES `VF_MODULE_MODEL` WRITE;
-/*!40000 ALTER TABLE `VF_MODULE_MODEL` DISABLE KEYS */;
-INSERT INTO `VF_MODULE_MODEL` VALUES ('0b289140-9639-477b-a7a9-fdd986d99bd8','null','c3fffe47-e9ba-4e31-b650-00c1da3c8c5b','4057f859-c218-402f-b176-01b9877288d7','1','Base',NULL,NULL,'5525dd38-b185-4ef1-aa66-6e96d0437f0b','base_vvg');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('0db11c68-0af2-4f87-aa91-9303d15d4143','null','70146dae-fd10-462e-8a7a-0d8c6624cdf9','0eb526ba-d75b-4097-be65-0575c72c0b99','1','Base',NULL,NULL,'2f3b6df7-1c81-46f7-b5ef-2529627e6417','base_vcpe_vbng');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('0e6a57c1-abd7-436b-963f-1ad051cb3c40','null','db9a9ec4-6173-48ce-9df0-3a08ff1f6475','f782c254-01bf-4558-a65c-2252a60d4fa8','1','Base',NULL,NULL,'92725868-e2c5-4dcf-b7dc-e14a8815bcc9','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('1903fdc0-e839-4f3c-8b43-bac5503fc056','null','bd7ab543-37e6-42ed-8516-c70b8b284f2f','a69dc831-d3f6-4993-85e8-14518bb8f9db','1','Base',NULL,NULL,'bb2eb27e-9591-491a-b35a-3aa0e9cc57b9','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('1cbe89cb-8889-4ca3-8f01-d772e56d0f17','null','f2cb1edf-f10a-4dcc-933a-c0f6da918587','f766f761-2ca8-42a7-b746-fdd67bc70f9c','1','Base',NULL,NULL,'050cb7c0-3c3e-418d-b08d-3c58fd11fa55','base_vvg');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('1d4653f7-9578-440f-a325-d39495d2dead','null','4e9e9373-213c-4987-a215-c44ccc6c07b3','a927a760-ff55-401f-8a37-161b277205e4','1','Base',NULL,NULL,'9cb3fa20-501b-4d82-a03e-43c31113c5fb','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('20983c6f-bdbe-43d2-9897-e48f5596ef17','null','7ca7567c-f42c-4ed8-bcde-f8971b92d90a','513cc9fc-fff5-4c46-9728-393437536c4d','1','Base',NULL,NULL,'3803bf29-c913-4f7b-9483-1dfef28e1d78','base_vcpe_vgmux');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('2581c6d0-40a7-48dd-9fb7-30e9b9496b3e','null','7ca7567c-f42c-4ed8-bcde-f8971b92d90a','513cc9fc-fff5-4c46-9728-393437536c4d','1','Base',NULL,NULL,'d7cf16df-fe97-4aee-9b9e-9c27f89b5610','base_vcpe_vgmux');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('2ccfec2f-8e46-4d2d-9213-93a5b1395fc0','null','7ca7567c-f42c-4ed8-bcde-f8971b92d90a','513cc9fc-fff5-4c46-9728-393437536c4d','1','Base',NULL,NULL,'2a1eb839-b3c6-40f9-b7c1-efb3b26c70dc','base_vcpe_vgmux');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('2f2dc87c-bc90-4596-8456-6a7d60e0850a','null','395d13bc-de5d-48ac-8723-d4d3c000000c','63047f7b-3de3-4127-84b8-058c3a92b6ad','1','Expansion',NULL,NULL,'bc28ccc5-7685-449f-a41b-4021734f58da','dnsscaling');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('31d9a71a-2e44-4581-b9a2-8e000dc6ae6a','null','b459045d-c6d3-4955-b77f-3d94641f4552','4adc3bfd-a4a8-4d0c-ba3f-29f9db795976','1','Base',NULL,NULL,'699b2861-22f0-4a32-8497-1d373b7c85f8','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('341fcc33-de58-4471-9bb5-13a0c643dbce','null','a5593fdb-cf67-45e9-9b8a-369be20ae837','b46a43f8-f9eb-4588-9aae-6359f2e112b7','1','Expansion',NULL,NULL,'df759ce2-10a2-4504-aef4-2e9111c26c7a','dnsscaling');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('39a78b1b-d1cf-44af-9994-318dd7a672ce','null','e53c3b4b-b55a-42b8-a824-57c420e408f9','26f5d512-20bd-46ba-9144-4ca0168cf473','1','Base',NULL,NULL,'7b708ab0-1d4c-472c-9822-a7d020c4fecf','base_vpkg');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('3be9227d-ac6f-471a-98fa-4943f42fe91b','null','f37f737f-9e9d-4b57-820e-6bcf9ffe3fb2','ebcb2c42-fa5a-4f32-a7cc-31a93f96b5b2','1','Base',NULL,NULL,'9cd59c5c-9856-4376-9331-71b390f5691a','base_vcpe_vbng');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('3f8fc159-6e6a-450c-a99a-eed70e8df403','null','974f95c9-803d-419d-a4a0-3f8078c4a940','1f094eb8-ba4a-4bda-afcf-b5fc53cb8a88','1','Base',NULL,NULL,'d207b1b6-a439-412a-8a4e-b1aef0db6c57','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('42d4fdda-4d99-4887-ba9c-46562c18e3bb','null','77b1fb63-6176-4246-b243-cfc69a216fe7','1a78c191-5aef-40a5-b3d9-2781ae8a4f92','1','Base',NULL,NULL,'2af2bbbe-63d7-49ca-be71-90e55a813a99','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('45b87432-690e-4115-8f2a-8ef57597be79','null','5237df15-60ad-494d-8e8d-ec56d8609339','fc879b56-6a28-4c59-b3b0-87a097faf0b5','1','Base',NULL,NULL,'df759ce2-10a2-4504-aef4-2e9111c26c7a','base_vlb');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('45b9d6ff-1320-4b9f-8efa-21030effa9b1','null','59e5784d-ab31-4591-92fb-648ac12c7565','8acc7f41-cd32-4ebc-87d6-426cdb889fea','1','Base',NULL,NULL,'8ad76346-0545-4c65-a54c-8bcd62c8d7f6','base_vlb');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('4ba5186b-e0ab-415d-8757-172a9f904ee7','null','fe9fbf02-ec53-4762-a47b-0d02138c7ba0','3f51990f-e433-4283-aa7a-12fb47d4d78d','1','Base',NULL,NULL,'e99fe1c3-c970-4ab4-82a3-33a2289829f5','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('5109a63a-2c4f-47fe-b9e3-a90e8fac6a10','null','3c90bf5c-cd38-496a-89f4-5f080f543fff','049fe59d-72a3-42b3-91b1-4043564feb87','1','Base',NULL,NULL,'3ab10178-2307-4779-993b-d8d916642770','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('53430646-a6f7-4d80-9d02-97fb3b233521','null','bb5fefc2-aa81-474e-b3e7-bd6b093659a0','28e1bbec-52e3-478b-abc6-68fda9aa92bc','1','Base',NULL,NULL,'80bc8335-145b-4b42-9408-d450358f1bab','base_vpkg');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('5570a80f-7f7c-48b1-9afc-e1c6bdda3bf6','null','cdaad672-9299-49c9-a616-78f3730833a4','5c6fca56-a6f8-41a6-9be1-11500b6dfff2','1','Base',NULL,NULL,'c94127c3-d59a-4cf3-8a6a-a1a148a9d21f','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('571c5caf-bea1-4420-8d61-a831b4a22fdc','null','f0e1b9d3-166f-4c2d-8346-dfd3ff6f8316','eef5e1e5-a164-40ba-b4dd-d0e0acc014f3','1','Base',NULL,NULL,'4d1b6ce4-cd7e-42ce-bdf4-173710ebd53c','base_clearwater');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('59ffe5ba-cfaf-4e83-a2f3-159522dcebac','null','7ca7567c-f42c-4ed8-bcde-f8971b92d90a','513cc9fc-fff5-4c46-9728-393437536c4d','1','Base',NULL,NULL,'5724fcc8-2ae2-45ce-8d44-795092b85dee','base_vcpe_vgmux');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('5a880f5c-de89-4abf-917d-24ae4e850934','null','7ca7567c-f42c-4ed8-bcde-f8971b92d90a','513cc9fc-fff5-4c46-9728-393437536c4d','1','Base',NULL,NULL,'35803e11-0a26-4d3c-9056-17371c038f0f','base_vcpe_vgmux');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('69d963bf-c0ab-4e75-97b5-f46e1d212f14','null','3282b658-dcd3-4bfc-8cb0-63279fe190be','7aef942e-8131-41f7-8047-71fce68ad8ce','1','Base',NULL,NULL,'8cd3bf7d-6771-454d-bdf0-dfd36986c1b8','base_vpkg');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('6b71d46b-1d13-47bd-a97d-b283777c464f','null','4d2d8bc6-1b87-4ce8-bb93-bfcf21f63064','baf6efc6-3c3e-4004-a4bf-8f078d311244','1','Base',NULL,NULL,'3bc3c7fb-2aa2-485c-be1f-cdbba0409252','base_vcpe_vgw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('705e9c3c-e855-4842-a31a-e39f01560985','null','7ca7567c-f42c-4ed8-bcde-f8971b92d90a','513cc9fc-fff5-4c46-9728-393437536c4d','1','Base',NULL,NULL,'59d0a2ee-dd09-4fd7-866f-acaa739855bc','base_vcpe_vgmux');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('74aab1af-ad08-43fb-86d1-4810c0cf50ac','null','449eec34-d76d-4f22-b467-b5c8d1bc662b','3f086a59-c8f6-4c4c-8712-11392ee03e43','1','Base',NULL,NULL,'0a534cd4-6b40-4294-8a3c-411db2180e0c','base_vcpe_infra');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('761b31e4-3c0f-4117-bac6-b2581ac9a989','null','17ef5ce7-4121-4d23-aa7a-ecbe352b416f','d7aa9249-db50-4e18-8a0d-9c74c214cf48','1','Base',NULL,NULL,'6e52d51a-1d5a-4dfd-ab69-dac16784e620','base_vlb');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('7733191f-c58e-4934-b30d-98c0db7e6108','null','222cdf4a-244b-4f74-a1bf-c7c915a4176b','4cb66676-400d-487b-939f-783c77f7bbf4','1','Expansion',NULL,NULL,'6e52d51a-1d5a-4dfd-ab69-dac16784e620','dnsscaling');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('86bd5fe2-6b79-42d9-84c9-0633e4f7ebcc','null','1af2e4b1-c363-43f0-8b26-b621b6c93987','c20ac252-a9a9-4360-9e40-1fd5b0790424','1','Base',NULL,NULL,'8d495df7-47c8-4971-91d1-b93de4ed2f40','base_vlb');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('888a977c-13c9-4942-8e53-bd51888625f4','null','6943d5f7-c710-4405-9353-acae2f152afc','978221b8-3b6e-4429-b83e-8369152b1470','1','Base',NULL,NULL,'366e9c64-caf3-46d5-a849-61695400be91','base_clearwater');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('88e78e02-988a-462d-85c2-7628bf471b9f','null','7ca7567c-f42c-4ed8-bcde-f8971b92d90a','513cc9fc-fff5-4c46-9728-393437536c4d','1','Base',NULL,NULL,'136ca73b-ac72-4734-8236-13304e9aed60','base_vcpe_vgmux');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('8a15a15d-cbd2-4946-87b5-69476ab2596b','null','e53c3b4b-b55a-42b8-a824-57c420e408f9','26f5d512-20bd-46ba-9144-4ca0168cf473','1','Base',NULL,NULL,'25c0e63a-62be-45da-9cb3-37e244fcf664','base_vpkg');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('8cc7fac4-2c3f-4fdb-9eae-33a15eec9c72','null','59e1d32d-678a-4706-a7fb-4930460dce60','a9c67084-39da-4e0c-8298-aabf0da36ee4','1','Base',NULL,NULL,'bcfd6cff-219b-4dea-8c9b-e25541e72827','base_vlb');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('931e671e-7725-4147-b377-fc92c5b00cbd','null','5d2f5424-6b47-473a-9b6f-e4ad5a42080d','ec06c54a-b834-48c1-82d4-d03744fc2c80','1','Base',NULL,NULL,'8757a5ba-4c80-4de3-8c61-5fe136bd02be','base_clearwater');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('937ecbf2-e792-4216-b475-095d03a71c54','null','3c90bf5c-cd38-496a-89f4-5f080f543fff','049fe59d-72a3-42b3-91b1-4043564feb87','1','Base',NULL,NULL,'73379cc8-4cd2-49bb-a3b5-e3e38693aafc','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('95494fd6-54a5-44cf-9ee8-fc7adf893f16','null','0b3c74a3-8a55-4f56-a2cc-c0ec43cf24d6','0054157b-0598-4b8d-805f-a2cb0891f6cc','1','Base',NULL,NULL,'4a60ae92-57ac-447a-b24e-67fc0d59e232','base_vvg');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('9bbd841f-aa76-4fd6-a3f6-83ba7465c34d','null','3a6313c9-1520-424d-85bc-63c1c9ee4ca4','e20182ed-5f02-4256-8e83-88c435c1a8df','1','Base',NULL,NULL,'a2aa0335-3241-4f03-a902-17f309fe479c','base_vpkg');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('9d284b79-ff6d-45cc-81b2-1db821714e84','null','fbc56527-e3bd-422a-92f1-530e58017b88','ce682755-cdc9-417a-8d9f-b894c3b951d5','1','Base',NULL,NULL,'7236afdf-903f-43c3-969d-3c99643787ea','base_vcpe_vbrgemu');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('9f4c7aa4-4454-41ff-95e0-2bf5d9c74558','null','71c770da-1652-49a2-bd17-97a95e027123','6d32dcd6-f866-475b-98fe-629bae1a04ec','1','Expansion',NULL,NULL,'8ad76346-0545-4c65-a54c-8bcd62c8d7f6','dnsscaling');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('a3c74af3-4441-4e1f-b23b-839227c2b56d','null','2c2c88e1-6ae4-44a9-8cda-c221a8e8db7d','40aa3fc0-65e5-4a9b-a382-6235f843bb32','1','Base',NULL,NULL,'eaddf06d-4a85-4919-bf9a-ded1c48493ca','base_vcpe_vgw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('affab6eb-90ce-40d0-bf4c-e81abda2a119','null','4d2d8bc6-1b87-4ce8-bb93-bfcf21f63064','baf6efc6-3c3e-4004-a4bf-8f078d311244','1','Base',NULL,NULL,'9b14a452-4107-459c-abab-f485ea5ab93c','base_vcpe_vgw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('b4f14dde-d03d-49cb-b878-e79ad325bf84','null','cf7026de-1bff-4a21-932f-03dde2d4d6ad','5dfc0857-0e77-4c2d-a3b0-f2656bbd973e','1','Base',NULL,NULL,'bc28ccc5-7685-449f-a41b-4021734f58da','base_vlb');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('b7ac8294-0181-45f2-b59e-0a71e11fe5cd','null','05eb1da8-85c2-4a5c-81ca-6df587f5c049','7a154dc8-fe54-4328-a19f-c4006a55bf53','1','Base',NULL,NULL,'3bf1f25c-6120-4b26-9208-2e14e8093287','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('b96b87eb-4030-4ba9-805d-5a92db52759f','null','c67e55bf-d097-4ddf-b19a-980005265482','50dd56ae-a346-4dfb-b929-4e3fde174203','1','Base',NULL,NULL,'497101aa-128a-4212-b1bc-4acc4ef55f39','base_vcpe_infra');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('baa40973-450b-413f-86f7-3ac97383d6aa','null','6f382445-8a6f-42e2-b22e-3352c67afe64','ff711425-e630-4070-ad13-328a0618142b','1','Base',NULL,NULL,'1308b712-e956-4678-bbb4-95bb053719fb','base_clearwater');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('bb496648-65a1-4e47-bf92-99f11de47bbe','null','99d66f6e-84fd-4f1d-b30f-16cef63cd650','c2e44866-ad88-41df-bae0-c38e7206106d','1','Base',NULL,NULL,'11a6cd75-91a6-47bc-aeed-75a27db27357','base_vcpe_vgmux');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('bb71bfc9-edcf-450b-b28b-0d5b57f1d7c9','null','bdb61258-c550-42e3-8e28-b13bb7516125','84be55c5-d000-45fe-a26e-51ce61c13168','1','Base',NULL,NULL,'0a8170be-6630-473e-a281-72bb8c5073c1','base_vpkg');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('c25a3478-97f5-4c1f-bf34-8989d06befba','null','896108d0-3f57-4d94-aa3b-180d7b57bcb0','d4dbe9c5-468b-4b3d-bf8e-1b36ae7aa314','1','Base',NULL,NULL,'24b7a42c-43a2-459a-8c0b-14cfe2983078','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('c2b89e33-8aba-44b5-95e4-97ab0459b338','null','6bb5de2c-4204-4809-89ed-b6cb98a198e4','c7f53587-439a-441e-bddb-9a223d10c256','1','Base',NULL,NULL,'02328586-9428-4655-ba74-b07ec04b87b8','base_vvg');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('cbbc2b4e-59e3-4812-98a7-a3b449f0782e','null','1ea273ca-3527-48da-baa7-17259608dac3','1c90238f-4045-4f39-8347-e8c3a5474b5e','1','Base',NULL,NULL,'cb8f6ccd-c8b7-4169-a7de-9e0a69457783','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('d825dcf1-5dd8-45fe-9e4c-c2ce708c9b0e','null','12363638-ac13-499e-9f0e-3418dac41e73','c9d0e8d8-2617-4e6f-8b47-3f472677d3ad','1','Expansion',NULL,NULL,'8d495df7-47c8-4971-91d1-b93de4ed2f40','dnsscaling');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('da59ddde-3b7f-4683-9c1b-5918c2002dcd','null','c3c668a3-0280-41c3-87fd-2516c512c1ad','1a44584d-4308-4f57-b34d-95bbe7f542c0','1','Base',NULL,NULL,'13432bde-f701-4c8d-9962-d4325c60d466','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('e0d1984c-42e9-4361-9821-23a329c34a4f','null','079ad518-4a50-4608-a247-213dc5a36826','68a59a48-f59f-4ec0-9217-d3700890f6ed','1','Base',NULL,NULL,'23219762-d5d8-48aa-b8e7-674878f16d98','base_vpkg');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('e5df393e-e86f-4a04-91ae-04de9a20adf0','null','ac1a7fb3-0d0f-4ab5-9439-ea2e10847aa7','f7007619-04d0-4046-a480-57bca7aa46b8','1','Base',NULL,NULL,'86c1f2b6-a2b5-44cc-97d3-ae29366ac2b1','base_vfw');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('f265592e-6ebb-42de-a487-fdf0b4d677f2','null','db536c34-bcdd-42a3-a91c-f162f77807cb','e3a7aeed-cabe-4129-88da-0acb7640f002','1','Base',NULL,NULL,'9f5855de-b9fb-4b14-8bce-1868da9d72aa','base_vcpe_vbrgemu');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('f2ce9c3e-e3bc-4bce-ad75-e3f5ac17d7cb','null','a33130c6-3279-47d4-b4df-547eb60365ad','8479a9c7-4e51-4994-ada0-a6bb171cd0b0','1','Base',NULL,NULL,'3df5fb34-6c7c-4f8e-b5d2-e870c39e2a2a','base_vvg');
-INSERT INTO `VF_MODULE_MODEL` VALUES ('fbb8c440-51a7-4995-8d30-67ceaf683cf5','null','d2648d62-60a5-45d7-945d-0edc3c5a4004','39571511-21c6-4ff8-b76b-0861adff94fd','1','Expansion',NULL,NULL,'bcfd6cff-219b-4dea-8c9b-e25541e72827','dnsscaling');
-/*!40000 ALTER TABLE `VF_MODULE_MODEL` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Dumping data for table `VF_MODULE_TO_VFC_MAPPING`
---
-
-LOCK TABLES `VF_MODULE_TO_VFC_MAPPING` WRITE;
-/*!40000 ALTER TABLE `VF_MODULE_TO_VFC_MAPPING` DISABLE KEYS */;
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1591,'2581c6d0-40a7-48dd-9fb7-30e9b9496b3e','8b84aeae-51cf-48c2-8bb1-50c7aa444a16','vgmux',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1592,'88e78e02-988a-462d-85c2-7628bf471b9f','8b84aeae-51cf-48c2-8bb1-50c7aa444a16','vgmux',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1593,'20983c6f-bdbe-43d2-9897-e48f5596ef17','8b84aeae-51cf-48c2-8bb1-50c7aa444a16','vgmux',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1594,'6b71d46b-1d13-47bd-a97d-b283777c464f','023fcd99-b707-4084-81f2-5bc4c58a62fc','vgw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1595,'39a78b1b-d1cf-44af-9994-318dd7a672ce','bc5ce901-76a8-4516-b65d-26cec4ba463c','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1596,'937ecbf2-e792-4216-b475-095d03a71c54','a9139e95-84ea-42d7-a4bb-a72b29a40970','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1597,'937ecbf2-e792-4216-b475-095d03a71c54','5130f20f-66c2-4ae5-8f93-bdb4ef857585','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1598,'86bd5fe2-6b79-42d9-84c9-0633e4f7ebcc','fc6d305f-4b2a-46c8-b2a6-e22ffa0c84e5','vlb',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1599,'86bd5fe2-6b79-42d9-84c9-0633e4f7ebcc','c16a5cd1-72ed-44b9-b4b0-fd0b8a8a3710','vdns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1600,'86bd5fe2-6b79-42d9-84c9-0633e4f7ebcc','1d63438f-8683-481d-af5c-8a440ff6c86e','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1601,'d825dcf1-5dd8-45fe-9e4c-c2ce708c9b0e','5a81616f-3b85-47f9-b3a6-43ddc9d705d1','vdns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1602,'e5df393e-e86f-4a04-91ae-04de9a20adf0','28ff8b3e-486a-4f15-bcd8-5bab711d5c33','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1603,'e5df393e-e86f-4a04-91ae-04de9a20adf0','c8033d10-afbb-4310-b90b-abd4140c191f','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1604,'53430646-a6f7-4d80-9d02-97fb3b233521','e7f9b901-b846-49eb-942b-9bf778a7d2c8','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1605,'9f4c7aa4-4454-41ff-95e0-2bf5d9c74558','75fabac4-56d8-4976-899f-0119543fd2b8','vdns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1606,'45b9d6ff-1320-4b9f-8efa-21030effa9b1','9166ff2f-23cb-4028-97e5-dc591fcfef3c','vdns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1607,'45b9d6ff-1320-4b9f-8efa-21030effa9b1','1782c476-7f94-4c01-9921-02459a6ce3cb','vlb',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1608,'45b9d6ff-1320-4b9f-8efa-21030effa9b1','0b221466-3962-42cd-b241-e08093869999','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1609,'5a880f5c-de89-4abf-917d-24ae4e850934','8b84aeae-51cf-48c2-8bb1-50c7aa444a16','vgmux',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1610,'affab6eb-90ce-40d0-bf4c-e81abda2a119','023fcd99-b707-4084-81f2-5bc4c58a62fc','vgw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1611,'8a15a15d-cbd2-4946-87b5-69476ab2596b','bc5ce901-76a8-4516-b65d-26cec4ba463c','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1612,'5109a63a-2c4f-47fe-b9e3-a90e8fac6a10','a9139e95-84ea-42d7-a4bb-a72b29a40970','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1613,'5109a63a-2c4f-47fe-b9e3-a90e8fac6a10','5130f20f-66c2-4ae5-8f93-bdb4ef857585','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1614,'888a977c-13c9-4942-8e53-bd51888625f4','67a8fd2d-c4fc-4982-8680-7cceaad13cf6','bono',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1615,'888a977c-13c9-4942-8e53-bd51888625f4','7d3af2a5-4d58-4f65-80c5-e9f56d68e374','homestead',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1616,'888a977c-13c9-4942-8e53-bd51888625f4','d921d8e0-72ef-4e82-9a5c-f8c524d9db72','sprout',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1617,'888a977c-13c9-4942-8e53-bd51888625f4','d160bb89-8331-4f8f-b323-aadeaf6ad719','dns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1618,'888a977c-13c9-4942-8e53-bd51888625f4','74a491fb-98e5-4988-aab4-173d018a29c8','ralf',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1619,'888a977c-13c9-4942-8e53-bd51888625f4','03ac3cb1-60fc-4ae1-bd5a-68c478bf6a8e','ellis',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1620,'888a977c-13c9-4942-8e53-bd51888625f4','76800448-f19b-4834-a0ce-65df373e6433','homer',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1621,'1d4653f7-9578-440f-a325-d39495d2dead','1fc2d7f5-036f-4a77-b840-83277e76f13c','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1622,'1d4653f7-9578-440f-a325-d39495d2dead','4795998e-8cd5-4b8f-ada9-fe9488392da8','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1623,'1d4653f7-9578-440f-a325-d39495d2dead','bb69f2d4-be8a-400f-9d6d-6e9500664dbc','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1624,'5570a80f-7f7c-48b1-9afc-e1c6bdda3bf6','db207678-8018-4829-bec6-4143743b1a29','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1625,'5570a80f-7f7c-48b1-9afc-e1c6bdda3bf6','cf60de5e-1332-43fc-8640-a94b5013dea7','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1626,'5570a80f-7f7c-48b1-9afc-e1c6bdda3bf6','54e98abe-743a-400d-809c-095644d92dd9','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1627,'fbb8c440-51a7-4995-8d30-67ceaf683cf5','bfbbab1c-b257-4ea9-81e0-416755b28df7','vdns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1628,'8cc7fac4-2c3f-4fdb-9eae-33a15eec9c72','aa999b75-51fd-451a-8556-c59e13cb3cd6','vlb',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1629,'8cc7fac4-2c3f-4fdb-9eae-33a15eec9c72','f8581354-8c0c-4199-9fc3-dcdf0ecef3d9','vdns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1630,'8cc7fac4-2c3f-4fdb-9eae-33a15eec9c72','66bc8dbf-26c6-4b12-9b87-c29b14cb1bac','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1631,'7733191f-c58e-4934-b30d-98c0db7e6108','64508b50-a134-41d4-a957-ba40718dc250','vdns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1632,'761b31e4-3c0f-4117-bac6-b2581ac9a989','ff8f1549-c4cf-44b5-b8a3-884e1a586319','vlb',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1633,'761b31e4-3c0f-4117-bac6-b2581ac9a989','12cee19b-3c7e-4a61-9c3e-123702c6a2f5','vdns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1634,'761b31e4-3c0f-4117-bac6-b2581ac9a989','73c626ff-5b74-4f4f-a13a-a0998fa197e5','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1635,'c25a3478-97f5-4c1f-bf34-8989d06befba','6163e3b4-ad26-4b16-a3cd-d0f3a3c66214','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1636,'c25a3478-97f5-4c1f-bf34-8989d06befba','6be7deec-f93d-48ab-a6c4-ea844da22d0f','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1637,'c25a3478-97f5-4c1f-bf34-8989d06befba','708364f6-83e5-40dd-a3cd-1903cda658f5','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1638,'da59ddde-3b7f-4683-9c1b-5918c2002dcd','31b53e81-28c3-482e-842c-0ebd21053b59','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1639,'da59ddde-3b7f-4683-9c1b-5918c2002dcd','b4100ed9-507a-4be4-a456-0e49482a58ac','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1640,'da59ddde-3b7f-4683-9c1b-5918c2002dcd','919ae940-5485-4270-9bb2-980213db6b95','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1641,'b96b87eb-4030-4ba9-805d-5a92db52759f','2b4c6ecd-2423-41ec-a8ff-ee4ecc05670d','vweb',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1642,'b96b87eb-4030-4ba9-805d-5a92db52759f','f219a42a-d5a6-4354-b072-259932ed8b48','vdns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1643,'b96b87eb-4030-4ba9-805d-5a92db52759f','5418661d-07e1-403a-8caf-03f5442f2308','vaaa',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1644,'b96b87eb-4030-4ba9-805d-5a92db52759f','652259eb-1b57-4f6e-8d22-6420a8261938','vdhcp',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1645,'0db11c68-0af2-4f87-aa91-9303d15d4143','9f07ef60-6dea-4e20-b4d4-c78b1b8bda32','vbng',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1646,'f265592e-6ebb-42de-a487-fdf0b4d677f2','493be6dd-c307-4d84-bee4-2ed50e044f54','vbrgemu',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1647,'a3c74af3-4441-4e1f-b23b-839227c2b56d','4440906c-a7e7-478b-a637-812999219fd1','vgw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1648,'bb496648-65a1-4e47-bf92-99f11de47bbe','bf9a909c-17ef-4a69-ac1f-56d05c53c528','vgmux',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1649,'b4f14dde-d03d-49cb-b878-e79ad325bf84','2b44c9db-28e1-45aa-b297-a4511d5317fe','vdns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1650,'b4f14dde-d03d-49cb-b878-e79ad325bf84','fb09a01b-249b-4038-bcf9-db20b0f206c9','vlb',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1651,'b4f14dde-d03d-49cb-b878-e79ad325bf84','4dfadd90-d618-4c8d-b47d-60efebf6d01d','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1652,'2f2dc87c-bc90-4596-8456-6a7d60e0850a','547126cc-f04f-458b-906a-ecb8463a058a','vdns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1653,'42d4fdda-4d99-4887-ba9c-46562c18e3bb','195f76ea-8256-4a07-b525-b40267c37b21','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1654,'42d4fdda-4d99-4887-ba9c-46562c18e3bb','6e3b40fc-e28b-4158-ae96-fcdb901cb7f4','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1655,'42d4fdda-4d99-4887-ba9c-46562c18e3bb','f43ab7a9-ab7a-4720-9f98-5bb409f5d6e7','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1656,'9d284b79-ff6d-45cc-81b2-1db821714e84','b8dd3ed9-cc4d-484a-af2c-0e18f4568fb3','vbrgemu',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1657,'baa40973-450b-413f-86f7-3ac97383d6aa','2c4cb9db-c093-4c7c-ad3d-fae4ffa17486','bono',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1658,'baa40973-450b-413f-86f7-3ac97383d6aa','48e19b0c-73d4-43c1-8172-a603cc6a0a27','homestead',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1659,'baa40973-450b-413f-86f7-3ac97383d6aa','32e76c6c-5676-4ce2-96df-e8b8adde7d42','sprout',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1660,'baa40973-450b-413f-86f7-3ac97383d6aa','702036e1-6270-4e3d-b2a2-8d6218dd325d','dns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1661,'baa40973-450b-413f-86f7-3ac97383d6aa','48687b06-df68-4180-a0b8-bafda155ea4c','ralf',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1662,'baa40973-450b-413f-86f7-3ac97383d6aa','54e94ecb-84f1-45d1-88a3-235e6a229ad3','ellis',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1663,'baa40973-450b-413f-86f7-3ac97383d6aa','67194296-d115-467b-99c2-bfd50d9e175f','homer',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1664,'74aab1af-ad08-43fb-86d1-4810c0cf50ac','25011296-744f-4cf6-80ed-476758829e90','vweb',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1665,'74aab1af-ad08-43fb-86d1-4810c0cf50ac','805be1fb-285d-4487-a9a2-223e995df5a4','vdns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1666,'74aab1af-ad08-43fb-86d1-4810c0cf50ac','2435ffd0-cf02-4c82-a6df-655986b2518b','vaaa',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1667,'74aab1af-ad08-43fb-86d1-4810c0cf50ac','d9ee5ccc-acc3-4658-9068-e2d60942040d','vdhcp',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1668,'59ffe5ba-cfaf-4e83-a2f3-159522dcebac','8b84aeae-51cf-48c2-8bb1-50c7aa444a16','vgmux',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1669,'931e671e-7725-4147-b377-fc92c5b00cbd','5f6f8dd5-f078-4a8a-a596-8b18c81d4370','bono',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1670,'931e671e-7725-4147-b377-fc92c5b00cbd','da32c96d-2f04-4548-8670-39ff222a3af4','homestead',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1671,'931e671e-7725-4147-b377-fc92c5b00cbd','dbdcd5f1-014c-462c-a950-ba17813f9485','sprout',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1672,'931e671e-7725-4147-b377-fc92c5b00cbd','ada34b73-f715-41eb-a6ad-c9d868e86728','dns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1673,'931e671e-7725-4147-b377-fc92c5b00cbd','5eb99594-a29e-4943-8820-fd63de08170d','ralf',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1674,'931e671e-7725-4147-b377-fc92c5b00cbd','a99c320c-64d0-44ac-8edb-16d781dde678','ellis',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1675,'931e671e-7725-4147-b377-fc92c5b00cbd','e5fd954f-adcb-4675-b763-cc216bbe68b1','homer',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1676,'cbbc2b4e-59e3-4812-98a7-a3b449f0782e','98f311f9-39e0-4b96-be75-548fe6953247','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1677,'cbbc2b4e-59e3-4812-98a7-a3b449f0782e','8be6b1e3-cfbb-4f62-8820-067bc784585d','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1678,'69d963bf-c0ab-4e75-97b5-f46e1d212f14','c231d966-7c33-475b-b1da-6d8183a14f36','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1679,'31d9a71a-2e44-4581-b9a2-8e000dc6ae6a','377825eb-e83d-49b6-81ce-c99a0d30064e','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1680,'31d9a71a-2e44-4581-b9a2-8e000dc6ae6a','25d3be48-fc4b-453f-96de-97e07e6c18f5','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1681,'31d9a71a-2e44-4581-b9a2-8e000dc6ae6a','37e7c1c1-d886-47e1-90a8-f907fcb312c3','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1682,'b7ac8294-0181-45f2-b59e-0a71e11fe5cd','bffb18fa-e09f-4d2e-9a56-6f032e03ac19','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1683,'b7ac8294-0181-45f2-b59e-0a71e11fe5cd','267d9b14-e8e3-4fcc-9cbd-da3d1b6ae843','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1684,'9bbd841f-aa76-4fd6-a3f6-83ba7465c34d','08559203-1f1e-4424-ac5f-6ec24bb8bf6d','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1685,'3be9227d-ac6f-471a-98fa-4943f42fe91b','c5a89a5b-e5bb-47eb-a382-b46cfe8adf5e','vbng',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1686,'705e9c3c-e855-4842-a31a-e39f01560985','8b84aeae-51cf-48c2-8bb1-50c7aa444a16','vgmux',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1687,'571c5caf-bea1-4420-8d61-a831b4a22fdc','21352862-eb18-4867-8ea2-d524f2f98647','bono',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1688,'571c5caf-bea1-4420-8d61-a831b4a22fdc','f88cf470-4821-4a8e-a088-9249eaf046b0','homestead',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1689,'571c5caf-bea1-4420-8d61-a831b4a22fdc','20a556fe-312a-41ab-9a03-374063d23aea','sprout',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1690,'571c5caf-bea1-4420-8d61-a831b4a22fdc','17d5c405-cfcb-4abc-96e4-a0e6fce100cb','dns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1691,'571c5caf-bea1-4420-8d61-a831b4a22fdc','cb751f30-9cd7-4c7f-999e-73c2691da482','ralf',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1692,'571c5caf-bea1-4420-8d61-a831b4a22fdc','70bf02d6-28ae-4bbb-9c37-0057017a15c9','ellis',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1693,'571c5caf-bea1-4420-8d61-a831b4a22fdc','fcb6d888-d5ef-4955-9474-ef4deae1201e','homer',2);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1694,'bb71bfc9-edcf-450b-b28b-0d5b57f1d7c9','30969396-fa5a-4faf-9163-db6484e54e59','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1695,'3f8fc159-6e6a-450c-a99a-eed70e8df403','98608c67-9b1a-4160-849c-060171c0ae16','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1696,'3f8fc159-6e6a-450c-a99a-eed70e8df403','3b08d0cb-3f1c-4178-8dab-bf7b85782f00','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1697,'4ba5186b-e0ab-415d-8757-172a9f904ee7','416b75a7-32ea-458c-95fe-c14854d618ca','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1698,'4ba5186b-e0ab-415d-8757-172a9f904ee7','13ec94e1-b04c-4fd1-99e6-c982020e453f','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1699,'4ba5186b-e0ab-415d-8757-172a9f904ee7','1203cf96-76de-4325-bb58-0053f1c6ddb1','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1700,'2ccfec2f-8e46-4d2d-9213-93a5b1395fc0','8b84aeae-51cf-48c2-8bb1-50c7aa444a16','vgmux',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1701,'45b87432-690e-4115-8f2a-8ef57597be79','e472f39e-2371-4dce-8b5e-883094836201','vdns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1702,'45b87432-690e-4115-8f2a-8ef57597be79','22245ea3-605f-4a9f-94b9-cf39ef7f3c0e','vlb',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1703,'45b87432-690e-4115-8f2a-8ef57597be79','61ac4ca1-9516-43c8-ab0e-d869e3d5d011','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1704,'341fcc33-de58-4471-9bb5-13a0c643dbce','cf16c622-b9e4-4712-924b-8008f47d84ef','vdns',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1705,'1903fdc0-e839-4f3c-8b43-bac5503fc056','61a24df6-cde4-4d83-ae28-ed1f60e85381','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1706,'1903fdc0-e839-4f3c-8b43-bac5503fc056','22c63259-70c3-4d19-8f75-47ebef517be4','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1707,'1903fdc0-e839-4f3c-8b43-bac5503fc056','bfd5e865-92a4-45a1-888d-ba7c2497ad50','vpg',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1708,'0e6a57c1-abd7-436b-963f-1ad051cb3c40','f9484812-fe80-4f5a-8428-538ddbca2586','vsn',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1709,'0e6a57c1-abd7-436b-963f-1ad051cb3c40','d057afa2-edab-4be3-93cb-89854e40c298','vfw',1);
-INSERT INTO `VF_MODULE_TO_VFC_MAPPING` VALUES (1710,'e0d1984c-42e9-4361-9821-23a329c34a4f','63227786-48c6-4e70-a229-64a4dd79d8c4','vpg',1);
-/*!40000 ALTER TABLE `VF_MODULE_TO_VFC_MAPPING` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2020-11-02 21:47:47
diff --git a/ms/generic-resource-api/src/main/resources/db/changelog/db.changelog-master.yaml b/ms/generic-resource-api/src/main/resources/db/changelog/db.changelog-master.yaml
deleted file mode 100644
index 087c324..0000000
--- a/ms/generic-resource-api/src/main/resources/db/changelog/db.changelog-master.yaml
+++ /dev/null
@@ -1,546 +0,0 @@
-databaseChangeLog:
-- changeSet:
-    id: 20210211-1
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-          - tableExists:
-              tableName: CONFIG_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES
-    changes:
-    - createTable:
-        tableName: CONFIG_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES
-        columns:
-        - column:
-            name: allottedResourceId
-            type: varchar(255)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: allottedResourceStatusAction
-            type: varchar(255)
-        - column:
-            name: allottedResourceStatusFinalIndicator
-            type: varchar(255)
-        - column:
-            name: allottedResourceStatusRequestStatus
-            type: varchar(255)
-        - column:
-            name: allottedResourceStatusResponseCode
-            type: varchar(255)
-        - column:
-            name: allottedResourceStatusResponseMessage
-            type: varchar(255)
-        - column:
-            name: allottedResourceStatusResponseTimestamp
-            type: varchar(255)
-        - column:
-            name: allottedResourceStatusRpcAction
-            type: varchar(255)
-        - column:
-            name: allottedResourceStatusRpcName
-            type: varchar(255)
-        - column:
-            name: arData
-            type: clob
-- changeSet:
-    id: 20210211-2
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not: 
-          - tableExists:
-              tableName: CONFIG_GRA_PORT_MIRROR_CONFIGURATIONS
-    changes:
-    - createTable:
-        tableName: CONFIG_GRA_PORT_MIRROR_CONFIGURATIONS
-        columns:
-        - column:
-            name: configurationId
-            type: varchar(255)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: pmcData
-            type: clob
-        - column:
-            name: portMirrorConfigurationStatusAction
-            type: varchar(255)
-        - column:
-            name: portMirrorConfigurationStatusFinalIndicator
-            type: varchar(255)
-        - column:
-            name: portMirrorConfigurationStatusRequestStatus
-            type: varchar(255)
-        - column:
-            name: portMirrorConfigurationStatusResponseCode
-            type: varchar(255)
-        - column:
-            name: portMirrorConfigurationStatusResponseMessage
-            type: varchar(255)
-        - column:
-            name: portMirrorConfigurationStatusResponseTimestamp
-            type: varchar(255)
-        - column:
-            name: portMirrorConfigurationStatusRpcAction
-            type: varchar(255)
-        - column:
-            name: portMirrorConfigurationStatusRpcName
-            type: varchar(255)
-- changeSet:
-    id: 20210211-3
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-          - tableExists:
-              tableName: CONFIG_GRA_SERVICES
-    changes:
-    - createTable:
-        tableName: CONFIG_GRA_SERVICES
-        columns:
-        - column:
-            name: svcInstanceId
-            type: varchar(100)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: serviceStatusAction
-            type: varchar(255)
-        - column:
-            name: serviceStatusFinalIndicator
-            type: varchar(255)
-        - column:
-            name: serviceStatusRequestStatus
-            type: varchar(255)
-        - column:
-            name: serviceStatusResponseCode
-            type: varchar(255)
-        - column:
-            name: serviceStatusResponseMessage
-            type: varchar(255)
-        - column:
-            name: serviceStatusResponseTimestamp
-            type: varchar(255)
-        - column:
-            name: serviceStatusRpcAction
-            type: varchar(255)
-        - column:
-            name: serviceStatusRpcName
-            type: varchar(255)
-        - column:
-            name: svcData
-            type: clob
-- changeSet:
-    id: 20210211-4
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-          - tableExists:
-              tableName: CONFIG_PRELOAD_DATA
-    changes:
-    - createTable:
-        tableName: CONFIG_PRELOAD_DATA
-        columns:
-        - column:
-            name: preloadId
-            type: varchar(100)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: preloadType
-            type: varchar(25)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: preloadData
-            type: clob
-- changeSet:
-    id: 20210211-5
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-          - tableExists:
-              tableName: NODE_TYPES
-    changes:
-    - createTable:
-        tableName: NODE_TYPES
-        columns:
-        - column:
-            constraints:
-              nullable: false
-              primaryKey: true
-            name: nodetype
-            type: varchar(80)
-- changeSet:
-    id: 20210211-6
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-         - tableExists:
-              tableName: OPERATIONAL_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES
-    changes:
-    - createTable:
-        tableName: OPERATIONAL_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES
-        columns:
-        - column:
-            name: allottedResourceId
-            type: varchar(255)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: allottedResourceStatusAction
-            type: varchar(255)
-        - column:
-            name: allottedResourceStatusFinalIndicator
-            type: varchar(255)
-        - column:
-            name: allottedResourceStatusRequestStatus
-            type: varchar(255)
-        - column:
-            name: allottedResourceStatusResponseCode
-            type: varchar(255)
-        - column:
-            name: allottedResourceStatusResponseMessage
-            type: varchar(255)
-        - column:
-            name: allottedResourceStatusResponseTimestamp
-            type: varchar(255)
-        - column:
-            name: allottedResourceStatusRpcAction
-            type: varchar(255)
-        - column:
-            name: allottedResourceStatusRpcName
-            type: varchar(255)
-        - column:
-            name: arData
-            type: clob
-- changeSet:
-    id: 20210211-7
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-          - tableExists:
-              tableName: OPERATIONAL_GRA_PORT_MIRROR_CONFIGURATIONS
-    changes:
-    - createTable:
-        tableName: OPERATIONAL_GRA_PORT_MIRROR_CONFIGURATIONS
-        columns:
-        - column:
-            name: configurationId
-            type: varchar(255)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: pmcData
-            type: clob
-        - column:
-            name: portMirrorConfigurationStatusAction
-            type: varchar(255)
-        - column:
-            name: portMirrorConfigurationStatusFinalIndicator
-            type: varchar(255)
-        - column:
-            name: portMirrorConfigurationStatusRequestStatus
-            type: varchar(255)
-        - column:
-            name: portMirrorConfigurationStatusResponseCode
-            type: varchar(255)
-        - column:
-            name: portMirrorConfigurationStatusResponseMessage
-            type: varchar(255)
-        - column:
-            name: portMirrorConfigurationStatusResponseTimestamp
-            type: varchar(255)
-        - column:
-            name: portMirrorConfigurationStatusRpcAction
-            type: varchar(255)
-        - column:
-            name: portMirrorConfigurationStatusRpcName
-            type: varchar(255)
-- changeSet:
-    id: 20210211-8
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-          - tableExists:
-              tableName: OPERATIONAL_GRA_SERVICES
-    changes:
-    - createTable:
-        tableName: OPERATIONAL_GRA_SERVICES
-        columns:
-        - column:
-            name: svcInstanceId
-            type: varchar(100)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: serviceStatusAction
-            type: varchar(255)
-        - column:
-            name: serviceStatusFinalIndicator
-            type: varchar(255)
-        - column:
-            name: serviceStatusRequestStatus
-            type: varchar(255)
-        - column:
-            name: serviceStatusResponseCode
-            type: varchar(255)
-        - column:
-            name: serviceStatusResponseMessage
-            type: varchar(255)
-        - column:
-            name: serviceStatusResponseTimestamp
-            type: varchar(255)
-        - column:
-            name: serviceStatusRpcAction
-            type: varchar(255)
-        - column:
-            name: serviceStatusRpcName
-            type: varchar(255)
-        - column:
-            name: svcData
-            type: clob
-- changeSet:
-    id: 20210211-9
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-          - tableExists:
-              tableName: OPERATIONAL_PRELOAD_DATA
-    changes:
-    - createTable:
-        tableName: OPERATIONAL_PRELOAD_DATA
-        columns:
-        - column:
-            name: preloadId
-            type: varchar(100)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            constraints:
-              nullable: false
-              primaryKey: true
-            name: preloadType
-            type: varchar(25)
-        - column:
-            name: preloadData
-            type: clob
-- changeSet:
-    id: 20210211-10
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-          - tableExists:
-              tableName: SVC_LOGIC
-    changes:
-    - createTable:
-        tableName: SVC_LOGIC
-        columns:
-        - column:
-            name: module
-            type: varchar(80)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: rpc
-            type: varchar(80)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: version
-            type: varchar(40)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: mode
-            type: varchar(5)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: active
-            type: varchar(1)
-            constraints:
-              nullable: false
-        - column:
-            name: graph
-            type: longblob
-        - column:
-            name: modified_timestamp
-            type: timestamp
-            constraints:
-              nullable: false
-            defaultValueComputed: CURRENT_TIMESTAMP
-        - column:
-            name: md5sum
-            type: varchar(128)
-- changeSet:
-    id: 20210211-11
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-          - tableExists:
-              tableName: TEST_RESULT_CONFIG
-    changes:
-    - createTable:
-        tableName: TEST_RESULT_CONFIG
-        columns:
-        - column:
-            name: id
-            type: bigint
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: results
-            type: varchar(255)
-        - column:
-            name: testIdentifier
-            type: varchar(255)
-- changeSet:
-    id: 20210211-12
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-          - tableExists:
-              tableName: TEST_RESULT_OPERATIONAL
-    changes:
-    - createTable:
-        tableName: TEST_RESULT_OPERATIONAL
-        columns:
-        - column:
-            name: id
-            type: bigint
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: results
-            type: varchar(255)
-        - column:
-            name: testIdentifier
-            type: varchar(255)
-- changeSet:
-    id: 20210211-13
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-          - tableExists:
-              tableName: hibernate_sequence
-    changes:
-    - createTable:
-        tableName: hibernate_sequence
-        columns:
-        - column:
-            name: next_val
-            type: bigint
-- changeSet:
-    id: 20210216-1
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-          - tableExists:
-              tableName: CONFIG_GRA_NETWORKS
-    changes:
-    - createTable:
-        tableName: CONFIG_GRA_NETWORKS
-        columns:
-        - column:
-            name: svcInstanceId
-            type: varchar(100)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: networkId
-            type: varchar(100)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: networkData
-            type: clob
-- changeSet:
-    id: 20210216-2
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-          - tableExists:
-              tableName: CONFIG_GRA_VNFS
-    changes:
-    - createTable:
-        tableName: CONFIG_GRA_VNFS
-        columns:
-        - column:
-            name: svcInstanceId
-            type: varchar(100)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: vnfId
-            type: varchar(100)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: vnfData
-            type: clob
-- changeSet:
-    id: 20210216-3
-    author: dtimoney@att.com
-    preConditions:
-      - onFail: MARK_RAN
-      - not:
-          - tableExists:
-              tableName: CONFIG_GRA_VF_MODULES
-    changes:
-    - createTable:
-        tableName: CONFIG_GRA_VF_MODULES
-        columns:
-        - column:
-            name: svcInstanceId
-            type: varchar(100)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: vnfId
-            type: varchar(100)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: vfModuleId
-            type: varchar(100)
-            constraints:
-              nullable: false
-              primaryKey: true
-        - column:
-            name: vfModuleData
-            type: clob
diff --git a/ms/generic-resource-api/src/main/resources/dblib.properties b/ms/generic-resource-api/src/main/resources/dblib.properties
deleted file mode 100644
index 568a9c4..0000000
--- a/ms/generic-resource-api/src/main/resources/dblib.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# openECOMP : SDN-C
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights
-# 						reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
-
-# dblib.properrties
-org.onap.ccsdk.sli.dbtype=jdbc
-
-org.onap.ccsdk.sli.jdbc.hosts=dbhost
-org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/${MYSQL_DATABASE}
-org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver
-org.onap.ccsdk.sli.jdbc.database=${MYSQL_DATABASE}
-org.onap.ccsdk.sli.jdbc.user=${MYSQL_USER}
-org.onap.ccsdk.sli.jdbc.password=${MYSQL_PASSWORD}
-org.onap.ccsdk.sli.jdbc.connection.name=dbhost
-org.onap.ccsdk.sli.jdbc.connection.timeout=50
-org.onap.ccsdk.sli.jdbc.request.timeout=100
-org.onap.ccsdk.sli.jdbc.limit.init=10
-org.onap.ccsdk.sli.jdbc.limit.min=10
-org.onap.ccsdk.sli.jdbc.limit.max=20
-org.onap.dblib.connection.recovery=false
-
diff --git a/ms/generic-resource-api/src/main/resources/generic-resource-api-dg.properties b/ms/generic-resource-api/src/main/resources/generic-resource-api-dg.properties
deleted file mode 100644
index 3751142..0000000
--- a/ms/generic-resource-api/src/main/resources/generic-resource-api-dg.properties
+++ /dev/null
@@ -1,77 +0,0 @@
-restapi.templateDir=/opt/onap/sdnc/restapi/templates
-controller.url=http://localhost:8080
-controller.user=${ODL_USER}
-controller.pwd=${ODL_PASSWORD}
-honeycomb.url=http://{honeycomb-instance-ip}:8183
-honeycomb.user=${HONEYCOMB_USER}
-honeycomb.pwd=${HONEYCOMB_PASSWORD}
-restapi.trustStoreFileName=/opt/onap/sdnc/config/truststoreONAPall.jks
-restapi.trustStorePassword=${TRUSTSTORE_PASSWORD}
-restapi.keyStoreFileName=/opt/onap/sdnc/config/org.onap.sdnc.p12
-restapi.keyStorePassword=${KEYSTORE_PASSWORD}
-restapi.connection-oof-url=http://oof-osdf:8698/api/oof/v1/route
-naming.gen-name.url=http://neng-serv:8080
-naming.gen-name.user=ccsdkapps
-naming.gen-name.pwd=ccsdkapps
-so.user=${SO_USER}
-so.pwd=${SO_PASSWORD}
-cds.url=http://cds-blueprints-processor-http:8080
-cds.user=${CDS_USER}
-cds.pwd=${CDS_PASSWORD}
-
-# Templates
-restapi.sz.templatefile=security-zone-allotted-resource.json
-restapi.cr.templatefile=contrail-route-allotted-resource.json
-restapi.brg.templatefile=brg-allotted-resource.json
-restapi.vpp.vxlan-tunnel.templatefile=vcpe-vxlan-tunnel.json
-restapi.vpp.bridge-domain.templatefile=vcpe-vpp-bridge-domain.json
-restapi.vpp.xconnect.templatefile=vcpe-l2-interface.json
-restapi.tx.templatefile=tunnelxconn-allotted-resource.json
-restapi.parentsvc.templatefile=parent-provided-allotted-resource.json
-restapi.network-ar.templatefile=network-provided-allotted-resources.json
-restapi.vnf-ar.templatefile=vnf-provided-allotted-resources.json
-restapi.services.templatefile=vcpe-services-service.json
-restapi.services.vnf.vfmodule.templatefile=vfmodule-vim-parameters.vgw.json
-restapi.sotn-attachment.templatefile=sotn-attachment-allotted-resource.json
-restapi.sdwan-attachment.templatefile=sdwan-attachment-allotted-resource.json
-restapi.oof-getpath.templatefile=oof-getpath.json
-restapi.naming.gen-name.templatefile=naming-ms-post-gen-name.json
-restapi.ss.pnf.templatefile=self-serve-pnf-assignments.json
-restapi.ss.vnf.templatefile=self-serve-vnf-assignments.json
-restapi.ss.vfmodule.templatefile=self-serve-vfmodule-assignments.json
-restapi.ss.mS.vlan.tag.assign.templatefile=self-serve-mS-vlan-tag-assignments.json
-restapi.ss.mS.vlan.tag.unassign.templatefile=self-serve-mS-vlan-tag-unassignments.json
-restapi.ss.mS.mac.address.assign.templatefile=self-serve-mS-mac-address-assign.json
-restapi.ss.mS.mac.address.unassign.templatefile=self-serve-mS-mac-address-unassign.json
-
-# Default cloud owner
-cloud-region.cloud-owner=CloudOwner
-
-# URLs
-restapi.cr-allottedresource=/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/
-restapi.sz-allottedresource=/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/
-restapi.brg-allottedresource=/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/
-restapi.vpp-honeycomb=/restconf/config/ietf-interfaces:interfaces/interface/{tunnel-name}/
-restapi.tx-allottedresource=/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/
-restapi.vnf-provided-allottedresource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources/
-restapi.network-provided-allottedresource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources/
-restapi.pm-configuration=/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/
-restapi.network=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/
-restapi.vnf=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/
-restapi.vnf-api.service-information=/restconf/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data/
-restapi.parent-provided-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-allotted-resources/provided-allotted-resource/{allotted-resource-id}/
-restapi.network-provided-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-provided-allotted-resources/
-restapi.services=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/
-restapi.service.vnf.vfmodule-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/
-restapi.connection-attachment-allottedresource=/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/
-restapi.naming.gen-name.service=/web/service/v1/genNetworkElementName
-restapi.ss-pnf-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/
-restapi.ss-vnf-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/
-restapi.ss-vfmodule-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/
-restapi.ss-mS-vlan-tag-assign=/vlantagapi/v1/{action}
-restapi.ss-mS-mac-address-assign=/api/macaddress/v1/service/assign/
-restapi.ss-mS-mac-address-unassign=/api/macaddress/v1/service/unassign/
-restapi.preload-network=/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{network-name}/network/preload-data/preload-network-topology-information/
-restapi.preloadinformation=/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/
-restapi.vf-module=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/
-restapi.vnf-assign=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/
diff --git a/ms/generic-resource-api/src/main/resources/log4j2.properties b/ms/generic-resource-api/src/main/resources/log4j2.properties
deleted file mode 100644
index 9bc78a3..0000000
--- a/ms/generic-resource-api/src/main/resources/log4j2.properties
+++ /dev/null
@@ -1,163 +0,0 @@
- #-
- # ============LICENSE_START=======================================================
- # ONAP - CCSDK
- # ================================================================================
- # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- # ================================================================================
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
- # You may obtain a copy of the License at
- # 
- #      http://www.apache.org/licenses/LICENSE-2.0
- # 
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
- # ============LICENSE_END=========================================================
- #
-
-property.logDir = ${env:LOG_PATH:-./target}
-property.logLevel = ${env:LOG_LEVEL:-INFO}
-
-property.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %X{currentGraph} - %X{nodeId} | %m%n
-
-#default mdc values
-property.ServiceName = INTERNAL
-property.ErrorCode = 900
-property.ErrorDesc = UnknownError
-
-rootLogger.level = ${logLevel}
-rootLogger.appenderRef.AppFile.ref = AppFile
-rootLogger.appenderRef.Console.ref = Console
-rootLogger.appenderRef.DebugFile.ref = DebugFile
-rootLogger.appenderRef.ErrorFile.ref = ErrorFile
-rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
-rootLogger.appenderRef.Console.filter.threshold.level = ${logLevel}
-
-appender.console.type = Console
-appender.console.name = Console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = ${pattern}
-
-appender.app.type = RollingRandomAccessFile
-appender.app.name = AppFile
-appender.app.fileName = ${logDir}/app.log
-appender.app.filePattern = ${logDir}/app.log.%i
-appender.app.immediateFlush = true
-appender.app.append = true
-appender.app.layout.type = PatternLayout
-appender.app.layout.pattern = ${pattern}
-appender.app.policies.type = Policies
-appender.app.policies.size.type = SizeBasedTriggeringPolicy
-appender.app.policies.size.size = 10MB
-appender.app.strategy.type = DefaultRolloverStrategy
-appender.app.strategy.max = 100
-appender.app.strategy.fileIndex = min
-
-appender.debug.type = RollingRandomAccessFile
-appender.debug.name = DebugFile
-appender.debug.fileName = ${logDir}/debug.log
-appender.debug.filePattern = ${logDir}/debug.log.%i
-appender.debug.immediateFlush = true
-appender.debug.append = true
-appender.debug.layout.type = PatternLayout
-appender.debug.layout.pattern = %d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestID}|%-16.16t|%-5.5p|%-32.32c{1}|%X{currentGraph} - %X{nodeId}|%m%n
-appender.debug.policies.type = Policies
-appender.debug.policies.size.type = SizeBasedTriggeringPolicy
-appender.debug.policies.size.size = 10MB
-appender.debug.strategy.type = DefaultRolloverStrategy
-appender.debug.strategy.max = 200
-appender.debug.strategy.fileIndex = min
-appender.error.filter.threshold.type = ThresholdFilter
-appender.error.filter.threshold.level = DEBUG
-
-appender.error.type = RollingRandomAccessFile
-appender.error.name = ErrorFile
-appender.error.fileName = ${logDir}/error.log
-appender.error.filePattern = ${logDir}/error.log.%i
-appender.error.immediateFlush = true
-appender.error.append = true
-appender.error.layout.type = PatternLayout
-appender.error.layout.pattern = %d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestID}|%-16.16t|$${ctx:ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%p|$${ctx:ErrorCode}|$${ctx:ErrorDesc}|%m%n
-
-appender.error.policies.type = Policies
-appender.error.policies.size.type = SizeBasedTriggeringPolicy
-appender.error.policies.size.size = 10MB
-appender.error.strategy.type = DefaultRolloverStrategy
-appender.error.strategy.max = 100
-appender.error.strategy.fileIndex = min
-appender.error.filter.threshold.type = ThresholdFilter
-appender.error.filter.threshold.level = WARN
-
-appender.metric.type = RollingRandomAccessFile
-appender.metric.name = MetricFile
-appender.metric.fileName = ${logDir}/metric.log
-appender.metric.filePattern = ${logDir}/metric.log.%i
-appender.metric.immediateFlush = true
-appender.metric.append = true
-appender.metric.layout.type = PatternLayout
-appender.metric.layout.pattern=%X{InvokeTimestamp}|%X{LogTimestamp}|%X{RequestID}|%X{ServiceInstanceID}|%-16.16t|%X{ServerFQDN}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceID}|%p|%X{Severity}|192.168.23.111|%X{ElapsedTime}|${hostName}|%X{ClientIPAddress}|%C{1}|||%X{TargetElement}|%markerSimpleName|%X|%X{currentGraph} - %X{nodeId}||%m%n
-appender.metric.policies.type = Policies
-appender.metric.policies.size.type = SizeBasedTriggeringPolicy
-appender.metric.policies.size.size = 10MB
-appender.metric.strategy.type = DefaultRolloverStrategy
-appender.metric.strategy.max = 100
-appender.metric.strategy.fileIndex = min
-
-appender.audit.type = RollingRandomAccessFile
-appender.audit.name = AuditFile
-appender.audit.fileName = ${logDir}/audit.log
-appender.audit.filePattern = ${logDir}/audit.log.%i
-appender.audit.immediateFlush = true
-appender.audit.append = true
-appender.audit.layout.type = PatternLayout
-appender.audit.layout.pattern=%X{EntryTimestamp}|%X{LogTimestamp}|%X{RequestID}|%X{ServiceInstanceID}|%-16.16t|%X{ServerFQDN}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceID}|INFO|%X{Severity}|192.168.23.111|%X{ElapsedTime}|${hostName}|%X{ClientIPAddress}|%C{1}|%X{AUDIT-Unused}|%X{AUDIT-ProcessKey}|%markerSimpleName|%X|||%m%n
-appender.audit.policies.type = Policies
-appender.audit.policies.size.type = SizeBasedTriggeringPolicy
-appender.audit.policies.size.size = 10MB
-appender.audit.strategy.type = DefaultRolloverStrategy
-appender.audit.strategy.max = 200
-appender.audit.strategy.fileIndex = min
-
-appender.rr.name = RequestResponseFile
-appender.rr.type = RollingRandomAccessFile
-appender.rr.fileName = ${logDir}/request-response.log
-appender.rr.filePattern = ${logDir}/request-response.log.%i
-appender.rr.immediateFlush = true
-appender.rr.append = true
-appender.rr.layout.type = PatternLayout
-appender.rr.layout.pattern = %d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestID}|%X{PartnerName}|%m%n
-appender.rr.policies.type = Policies
-appender.rr.policies.size.type = SizeBasedTriggeringPolicy
-appender.rr.policies.size.size = 10MB
-appender.rr.strategy.type = DefaultRolloverStrategy
-appender.rr.strategy.max = 100
-appender.rr.strategy.fileIndex = min
-
-logger.metric.name = org.onap.ccsdk.sli.core.filters.metric
-logger.metric.level = INFO
-logger.metric.additivity = false
-logger.metric.appenderRef.MetricFile.ref = MetricFile
-
-logger.metric2.name = org.onap.logging.filter.base.AbstractMetricLogFilter
-logger.metric2.level = INFO
-logger.metric2.additivity = false
-logger.metric2.appenderRef.MetricFile.ref = MetricFile
-
-logger.audit.name = org.onap.logging.filter.base.AbstractAuditLogFilter
-logger.audit.level = INFO
-logger.audit.additivity = false
-logger.audit.appenderRef.AuditFile.ref = AuditFile
-
-logger.rr.name = org.onap.logging.filter.base.PayloadLoggingServletFilter
-logger.rr.level = INFO
-logger.rr.additivity = false
-logger.rr.appenderRef.RequestResponseFile.ref = RequestResponseFile
-
-logger.ccsdk.name = org.onap.ccsdk
-logger.ccsdk.level = DEBUG
-
-logger.onaplogging.name = org.onap.logging
-logger.onaplogging.level = DEBUG
-\ No newline at end of file
diff --git a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.cred.props b/ms/generic-resource-api/src/main/resources/org.onap.sdnc.cred.props
deleted file mode 100644
index e702d61..0000000
--- a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.cred.props
+++ /dev/null
@@ -1,17 +0,0 @@
-############################################################
-# Properties Generated by AT&T Certificate Manager
-#   by root
-#   on 2020-04-07T19:49:10.483+0000
-# @copyright 2019, AT&T
-############################################################
-Challenge=enc:gsZC3qJk3ylRSusYHUQqBiflWlKXn4rnh-fULJmfIU3RAphd_AHmZ6c6kl42qcJE
-cadi_alias=sdnc@sdnc.onap.org
-cadi_key_password=enc:HLzeIrsDqKLcY1fNlbRTXVch5RrfUvAXKW_sJ9cv9Rs49q8GsiPsZDqboJXAT-lF
-cadi_keyfile=/opt/onap/ccsdk/config/org.onap.sdnc.keyfile
-cadi_keystore=/opt/onap/ccsdk/config/org.onap.sdnc.p12
-cadi_keystore_password=enc:aH6rL1KPu8ZzMtQ16FiMvGE-janpERZBU3tnVuGcXBaK2T9_3F28UuBH-GJ2BRjM
-cadi_keystore_password_jks=enc:ydq6zoDeWGdBbFXkF_bLHJ4HrhMn-cSZ11m-NUNCm116gYhsjF1HKfkqs6Wrn6Zl
-cadi_keystore_password_p12=enc:aH6rL1KPu8ZzMtQ16FiMvGE-janpERZBU3tnVuGcXBaK2T9_3F28UuBH-GJ2BRjM
-cadi_truststore=/opt/onap/ccsdk/config/org.onap.sdnc.trust.jks
-cadi_truststore_password=enc:Lhl6jEPxCYutrEpioq0woR1ypC4K1i9yPWKGRG7s9eARe5egSzsEBCooiKB7om5B
-cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US
diff --git a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.keyfile b/ms/generic-resource-api/src/main/resources/org.onap.sdnc.keyfile
deleted file mode 100644
index eb8fe84..0000000
--- a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.keyfile
+++ /dev/null
@@ -1,27 +0,0 @@
-Xgwa72kLHXU9NRElW4t4taIjudICPqMwywqYe1HVQ7Ve9ccqRRksY9gjK4hnDwU9mn0XdYEMlIU2
-OMWL4ck6PaxjHlaVR1qVBIFRcrkXs_ttagrjijBxXvJvJVI60JMCBGmIgNkI78wnEZOi6PLG0x7S
-agVQM34a5HHBEMePfqtgO-J8rBXMaeIrpHOTTEEtZXU-ZvbI8VZWhCD0e9fnn3YlFQaPeni0zqOE
-NY_lV6ZxlAtD5RCKdQWuU4O_cmmv3_LpIm41NT7Dn4sG6QzHjw2WM5essLTCEUvXJntlj3OmZTkr
-p4lPBVAWg2-qc_ZZyY2VEtoxVmKIMP15ctq50RVgPtQMmd-hdj5I51yW5MQYSM4jTgxtspiGUDJq
-ftsxb76K5w76X-ADxpZt85bEe068dwEoqZd5Qe33jIcZD2iNfGUb_ee1vSVlTQO1JlGqHAelUNks
-ellL5WE7X4g4TCG8KW38_GUOyohyQ5pv-Mozq-Sxz2bK8JCBs6hFBhKbnE07x3yY7SOBVnDbdCec
-cXZ86TNcdOsxBdqfNXD4PK_qMiXZTh3OMRsEG8IhhFyD3sbpFEyVhU_96o47iOgvAeAAiIKJ2Uww
-QUTHfNxp7LWUTw7aHhmK4wZLpFS-Lz1seat65uNp9DRuQ9jin0Hpi0XW1UwY4WzYvWeiQh2swwM8
-XCz9jawem18wTJ-pZUvKtkAQ5ImwSBuIFaKoUkbiowrNAGFOFGaFhtapV1uvehPlpmzbvn9HfPO8
-1xAp3Jusu3G4tGrrsJdvkenUB-3BbcJHMPE-Ku1jEWGoOXnrn0WURiHXhYMy8gWbko56ykftIJRP
-Q4bq4TCwxNE8nzhNXSh0_dqYK0JlAkoOtvkBogM42Ljly5ODCIDb7NZFtTyK3FpYVXLC-um9wYxI
-2t7V5N-nPinFf9hWzgTCvnjfAn0X2kAWTBQVwO-Sxepy40ZbTkEkQzsKyFKa3pnB_BmkE6dvQMqj
-QZlg5dpu3eacVSMPaZCdgISYN-pYrWNYtPKKlxYQgsK0Z6hJuS-87snx-WYRN4SRhWBY_b-G1EsZ
-SeL9L8daNXYzmOHnprenlz5ZqitnM_KoL9th_rG4krV8-Nlw1Rh7K_YcXuFsKGTlzYbuoHyM1CBn
-oWPIf32W5DN4BRcSTi74wV_tScQL4sueKYo3epZMrTA0djFyq94-wyA0bOzySQxcrGIvvLMITJ51
-U6c845RXFAK8_Z2Nt8-Mdv6Ox_KDmZtX4P9bNJ21nM9D9Htgr2H5GIBXFBt_ZDUzwZ5WLrs-l4Li
-26dHL5OudyekOaI4BVxg_09hRD9xNPpU5kiVcz5_QAi7QsnYqf53oB55H_NEhq1h3KOmqzJw9q7M
-kYQgO-q5Y5dIvduBe9zruFIQIt-WhhRJM8v4i50QNaOCnbZfmDalStlSzFX9xEXKESU8q-7VwxRT
-Aro7Teu_fS3PXvsgr6hHSf-SK2zbrizPG-5AaPn3SkBoU-3Ofr-HeJfihx0NnvcCnjDYvQw9C5d6
-845zvcrJrphNkXVPNO23lRMTEuStQiCbbdZcaNcPFXMpjlS4x8tonxwNqBBa4CwO7p5omkayEVLi
-i_JbOg4JSor1C_cSnA9TIfEcwVe9znPeEE01uFp_IBP5rJHuiInca-f7NbZFDkhO5LJPIoyvmTHZ
-76LBniKhcocSW8CR7Gc9Q8wxXJFEivQb4JvA1gd8VZ_A31yqnSTnApxGcAu1DEHNnCd9AVYIq9jd
-weFikVaf5n3GF-DBYxeesu1ChEmTOLN0tZw43uyAvqWrqLU_m5DspMAv-MNA0ddgcMOw8yph0035
-5HgcosFyhnx_FByGJtbr0bahZ1dJnswN_lXlRUYB2-WYnWUot-ONKiw3cD7kU095p3zPOHkd6KlI
-cyRcCDVN9KQkE-S9VDWBWD8V2A6wudLLICsRug_Ypa6doZKGcF335ZT9U54R9DNqUHCf3IEu0xl3
-YlQrkCwrFZB8WVMkfJQJKFfqYyjeH-t-afS3JR-PkH-qBRDFFYZ3m1anYuZI20-IiP8BZKCI
-\ No newline at end of file
diff --git a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.p12 b/ms/generic-resource-api/src/main/resources/org.onap.sdnc.p12
deleted file mode 100644
index 23a701a..0000000
--- a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.p12
+++ /dev/null
diff --git a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.props b/ms/generic-resource-api/src/main/resources/org.onap.sdnc.props
deleted file mode 100644
index adef904..0000000
--- a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.props
+++ /dev/null
@@ -1,14 +0,0 @@
-############################################################
-# Properties Generated by AT&T Certificate Manager
-#   by root
-#   on 2020-04-07T19:49:08.370+0000
-# @copyright 2019, AT&T
-############################################################
-aaf_id=sdnc@sdnc.onap.org
-aaf_locate_url=https://aaf-onap-test.osaaf.org:8095
-aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1
-cadi_latitude=38.432899
-cadi_longitude=-90.43248
-cadi_prop_files=/opt/onap/ccsdk/config/org.onap.sdnc.cred.props
-cm_url=https://AAF_LOCATE_URL/AAF_NS.cm:2.1
-cadi_protocols=TLSv1.1,TLSv1.2
diff --git a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.trust.jks b/ms/generic-resource-api/src/main/resources/org.onap.sdnc.trust.jks
deleted file mode 100644
index 7a69861..0000000
--- a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.trust.jks
+++ /dev/null
diff --git a/ms/generic-resource-api/src/main/resources/schema-demo.sql b/ms/generic-resource-api/src/main/resources/schema-demo.sql
deleted file mode 100644
index ddd3217..0000000
--- a/ms/generic-resource-api/src/main/resources/schema-demo.sql
+++ /dev/null
@@ -1,2847 +0,0 @@
-
---
--- Table structure for table `ACCESS_LOG`
---
-
-CREATE TABLE IF NOT EXISTS `ACCESS_LOG` (
-  `access_log_seq` int(11) NOT NULL AUTO_INCREMENT,
-  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `method` varchar(12) DEFAULT NULL,
-  `version` varchar(12) DEFAULT NULL,
-  `status` varchar(12) DEFAULT NULL,
-  `url` varchar(256) DEFAULT NULL,
-  `remote_address` varchar(128) DEFAULT NULL,
-  PRIMARY KEY (`access_log_seq`)
-) ENGINE=InnoDB AUTO_INCREMENT=1034 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `CUSTOMER`
---
-
-
-CREATE TABLE IF NOT EXISTS `CUSTOMER` (
-  `cust_id` int(11) NOT NULL AUTO_INCREMENT,
-  `customer_name` varchar(256) DEFAULT NULL,
-  `grua` varchar(4) NOT NULL,
-  `create_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`cust_id`),
-  UNIQUE KEY `IU1_CUSTOMER` (`customer_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=155 DEFAULT CHARSET=latin1;
-
-
---
--- Table structure for table `ADDRESS_PLAN_POLICIES`
---
-
-CREATE TABLE IF NOT EXISTS `ADDRESS_PLAN_POLICIES` (
-  `key_name` varchar(255) NOT NULL,
-  `key_value_source_type` varchar(255) NOT NULL,
-  `key_value_source` varchar(255) NOT NULL,
-  PRIMARY KEY (`key_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `AGNOSTIC_NOTIFICATION_URL`
---
-
-CREATE TABLE IF NOT EXISTS `AGNOSTIC_NOTIFICATION_URL` (
-  `service_type` varchar(128) NOT NULL,
-  `service_instance_id` varchar(128) NOT NULL,
-  `request_id` varchar(128) NOT NULL,
-  `svc_notification_url` varchar(256) NOT NULL,
-  PRIMARY KEY (`service_type`,`service_instance_id`,`request_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
---
--- Table structure for table `AGNOSTIC_TO_SVC_SPCFC_API`
---
-CREATE TABLE IF NOT EXISTS `AGNOSTIC_TO_SVC_SPCFC_API` (
-  `operation` varchar(128) NOT NULL,
-  `service` varchar(128) NOT NULL,
-  `service_specific_api` varchar(128) NOT NULL,
-  `async_process` varchar(15) DEFAULT NULL,
-  PRIMARY KEY (`operation`,`service`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `AIC_AVAIL_ZONE_POOL`
---
-CREATE TABLE IF NOT EXISTS `AIC_AVAIL_ZONE_POOL` (
-  `aic_site_id` varchar(100) NOT NULL,
-  `status` varchar(40) NOT NULL,
-  `availability_zone` varchar(100) NOT NULL,
-  `token` varchar(5) NOT NULL,
-  `vnf_id` varchar(80) DEFAULT NULL,
-  `service_type` varchar(100) NOT NULL,
-  `vnf_type` varchar(20) DEFAULT NULL,
-  `hypervisor` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`aic_site_id`,`availability_zone`,`token`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `AIC_HOSTNAME`
---
-CREATE TABLE IF NOT EXISTS `AIC_HOSTNAME` (
-  `hostname` varchar(20) NOT NULL,
-  `cust_id` int(11) NOT NULL,
-  `vendor_code` varchar(1) NOT NULL,
-  `virtual_device_type` varchar(2) DEFAULT NULL,
-  `device_sequence` varchar(3) NOT NULL,
-  `create_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`hostname`),
-  UNIQUE KEY `hostname` (`hostname`),
-  KEY `IN1_AIC_HOSTNAME` (`cust_id`),
-  CONSTRAINT `AC1_HOSTNAME` FOREIGN KEY (`cust_id`) REFERENCES `CUSTOMER` (`cust_id`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `AIC_NETWORK`
---
-
-CREATE TABLE IF NOT EXISTS `AIC_NETWORK` (
-  `network_id` varchar(100) NOT NULL,
-  `network_name` varchar(100) DEFAULT NULL,
-  `status` varchar(20) DEFAULT NULL,
-  `tenant_id` varchar(100) DEFAULT NULL,
-  `switch_uuid` varchar(100) DEFAULT NULL,
-  `portgroup_name` varchar(100) DEFAULT NULL,
-  `portgroup_id` varchar(100) DEFAULT NULL,
-  PRIMARY KEY (`network_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `AIC_SITE`
---
-
-CREATE TABLE IF NOT EXISTS `AIC_SITE` (
-  `name` varchar(100) DEFAULT NULL,
-  `aic_site_id` varchar(100) NOT NULL,
-  `vcenter_url` varchar(200) DEFAULT NULL,
-  `vcenter_username` varchar(40) DEFAULT NULL,
-  `vcenter_passwd` varbinary(255) DEFAULT NULL,
-  `city` varchar(100) DEFAULT NULL,
-  `state` varchar(2) DEFAULT NULL,
-  `operational_status` varchar(20) DEFAULT NULL,
-  `oam_gateway_addr` varchar(20) DEFAULT '',
-  PRIMARY KEY (`aic_site_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `AIC_SWITCH`
---
-
-CREATE TABLE IF NOT EXISTS `AIC_SWITCH` (
-  `switch_name` varchar(100) DEFAULT NULL,
-  `physical_network_name` varchar(100) NOT NULL,
-  `aic_site_id` varchar(100) DEFAULT NULL,
-  `uuid` varchar(100) DEFAULT NULL,
-  `availability_zone` varchar(100) DEFAULT NULL,
-  PRIMARY KEY (`physical_network_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `AIC_ZONE_CLOUD_REGION_ID`
---
-
-CREATE TABLE IF NOT EXISTS `AIC_ZONE_CLOUD_REGION_ID` (
-  `zone_region_id` varchar(255) NOT NULL,
-  `cilli_code` varchar(255) NOT NULL,
-  `location_id` varchar(255) NOT NULL DEFAULT '',
-  `city_state_country` varchar(255) NOT NULL DEFAULT '',
-  PRIMARY KEY (`zone_region_id`,`cilli_code`,`location_id`,`city_state_country`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `ALLOCATION_ITEM`
---
-
-CREATE TABLE IF NOT EXISTS `ALLOCATION_ITEM` (
-  `allocation_item_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `resource_id` bigint(20) NOT NULL,
-  `application_id` varchar(50) NOT NULL,
-  `resource_set_id` varchar(200) NOT NULL,
-  `resource_union_id` varchar(200) NOT NULL,
-  `resource_share_group_list` varchar(200) DEFAULT NULL,
-  `lt_used` bigint(20) DEFAULT NULL,
-  `ll_label` varchar(50) DEFAULT NULL,
-  `rr_used` varchar(200) DEFAULT NULL,
-  `allocation_time` datetime NOT NULL,
-  PRIMARY KEY (`allocation_item_id`),
-  UNIQUE KEY `allocation_item_id` (`allocation_item_id`),
-  UNIQUE KEY `IX2_ALLOCATION_ITEM` (`resource_id`,`resource_set_id`),
-  KEY `IX1_ALLOCATION_ITEM` (`resource_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=5764 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `ALLOTTED_RESOURCE_MODEL`
---
-
-CREATE TABLE IF NOT EXISTS `ALLOTTED_RESOURCE_MODEL` (
-  `customization_uuid` varchar(255) NOT NULL,
-  `model_yaml` longblob,
-  `invariant_uuid` varchar(255) DEFAULT NULL,
-  `uuid` varchar(255) DEFAULT NULL,
-  `version` varchar(255) DEFAULT NULL,
-  `naming_policy` varchar(255) DEFAULT NULL,
-  `ecomp_generated_naming` char(1) DEFAULT NULL,
-  `depending_service` varchar(255) DEFAULT NULL,
-  `role` varchar(255) DEFAULT NULL,
-  `type` varchar(255) DEFAULT NULL,
-  `service_dependency` varchar(255) DEFAULT NULL,
-  `allotted_resource_type` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`customization_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `ALTS_CREDENTIALS`
---
-
-CREATE TABLE IF NOT EXISTS `ALTS_CREDENTIALS` (
-  `alts_username` varchar(255) NOT NULL,
-  `alts_password` varbinary(255) NOT NULL,
-  PRIMARY KEY (`alts_username`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `ASDC_ARTIFACTS`
---
-
-CREATE TABLE IF NOT EXISTS `ASDC_ARTIFACTS` (
-  `asdc_artifacts_id` int(11) NOT NULL AUTO_INCREMENT,
-  `service_uuid` varchar(50) DEFAULT NULL,
-  `distribution_id` varchar(50) DEFAULT NULL,
-  `service_name` varchar(255) DEFAULT NULL,
-  `service_description` varchar(255) DEFAULT NULL,
-  `resource_uuid` varchar(255) DEFAULT NULL,
-  `resource_instance_name` varchar(255) DEFAULT NULL,
-  `resource_name` varchar(255) DEFAULT NULL,
-  `resource_version` varchar(50) DEFAULT NULL,
-  `resource_type` varchar(50) DEFAULT NULL,
-  `artifact_uuid` varchar(50) DEFAULT NULL,
-  `artifact_type` varchar(50) DEFAULT NULL,
-  `artifact_version` varchar(25) DEFAULT NULL,
-  `artifact_description` varchar(255) DEFAULT NULL,
-  `internal_version` int(11) DEFAULT NULL,
-  `creation_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `artifact_name` varchar(255) DEFAULT NULL,
-  `artifact_content` longtext,
-  PRIMARY KEY (`asdc_artifacts_id`),
-  UNIQUE KEY `asdc_artifacts_id` (`asdc_artifacts_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `ASDC_REFERENCE`
---
-
-CREATE TABLE IF NOT EXISTS `ASDC_REFERENCE` (
-  `asdc_reference_id` int(11) NOT NULL AUTO_INCREMENT,
-  `service_type` varchar(50) DEFAULT NULL,
-  `vnf_type` varchar(50) DEFAULT NULL,
-  `vnfc_type` varchar(50) DEFAULT NULL,
-  `file_category` varchar(50) DEFAULT NULL,
-  `action` varchar(50) DEFAULT NULL,
-  `artifact_type` varchar(50) DEFAULT NULL,
-  `artifact_name` varchar(255) NOT NULL,
-  PRIMARY KEY (`asdc_reference_id`),
-  UNIQUE KEY `asdc_reference_id` (`asdc_reference_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=latin1;
-
-
---
--- Table structure for table `BLOB_TEST`
---
-
-CREATE TABLE IF NOT EXISTS `BLOB_TEST` (
-  `seq` int(11) NOT NULL AUTO_INCREMENT,
-  `odl` varchar(20) DEFAULT NULL,
-  `communities` mediumblob,
-  `status` enum('NEW','COMPLETE','FAILED') NOT NULL DEFAULT 'NEW',
-  `retry_count` int(11) DEFAULT '-1',
-  PRIMARY KEY (`seq`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `CAPABILITY`
---
-
-CREATE TABLE IF NOT EXISTS `CAPABILITY` (
-  `capability_id` int(11) NOT NULL AUTO_INCREMENT,
-  `capability_name` varchar(50) NOT NULL,
-  `implementation_name` varchar(100) NOT NULL,
-  `operation_name` varchar(50) NOT NULL,
-  `operation_description` varchar(100) NOT NULL,
-  `input_definition` longtext,
-  `output_definition` longtext,
-  `dependency_definition` longtext,
-  `tags` varchar(100) DEFAULT NULL,
-  PRIMARY KEY (`capability_id`),
-  UNIQUE KEY `capability_id` (`capability_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=49 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `CITY_CODE`
---
-
-CREATE TABLE IF NOT EXISTS `CITY_CODE` (
-  `city_code_id` int(11) NOT NULL AUTO_INCREMENT,
-  `city_code` varchar(3) NOT NULL,
-  `city` varchar(150) NOT NULL,
-  `state` varchar(10) NOT NULL,
-  `country_code` varchar(10) NOT NULL,
-  PRIMARY KEY (`city_code_id`),
-  KEY `IN1_CITY_CODE` (`city`,`state`,`country_code`)
-) ENGINE=InnoDB AUTO_INCREMENT=37822 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `CLI_UPDATES`
---
-
-CREATE TABLE IF NOT EXISTS `CLI_UPDATES` (
-  `seq` int(11) NOT NULL AUTO_INCREMENT,
-  `status` enum('NEW','COMPLETE','FAILED') NOT NULL DEFAULT 'NEW',
-  `create_timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `last_processed_timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `target_address` varchar(128) DEFAULT NULL,
-  `cli_text` varchar(128) DEFAULT NULL,
-  PRIMARY KEY (`seq`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `CONFIGFILES`
---
-
-CREATE TABLE IF NOT EXISTS `CONFIGFILES` (
-  `config_file_id` int(11) NOT NULL AUTO_INCREMENT,
-  `external_version` varchar(50) DEFAULT NULL,
-  `data_source` varchar(25) DEFAULT NULL,
-  `creation_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `service_instance_id` varchar(50) DEFAULT NULL,
-  `vnf_type` varchar(50) DEFAULT NULL,
-  `vnfc_type` varchar(50) DEFAULT NULL,
-  `file_category` varchar(50) DEFAULT NULL,
-  `file_name` varchar(255) DEFAULT NULL,
-  `file_content` longtext,
-  `action` varchar(50) DEFAULT NULL,
-  `vnf_id` varchar(50) DEFAULT NULL,
-  `vm_name` varchar(50) DEFAULT NULL,
-  `vnf_name` varchar(50) DEFAULT NULL,
-  PRIMARY KEY (`config_file_id`),
-  UNIQUE KEY `config_file_id` (`config_file_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `CONFIGURE_ACTION_DG`
---
-
-
-CREATE TABLE IF NOT EXISTS `CONFIGURE_ACTION_DG` (
-  `configure_action_dg_id` int(11) NOT NULL AUTO_INCREMENT,
-  `vnf_type` varchar(50) DEFAULT NULL,
-  `action` varchar(50) DEFAULT NULL,
-  `init_config_dg` varchar(50) DEFAULT NULL,
-  `generate_config_dg` varchar(50) DEFAULT NULL,
-  `download_config_dg` varchar(50) DEFAULT NULL,
-  PRIMARY KEY (`configure_action_dg_id`),
-  UNIQUE KEY `configure_action_dg_id` (`configure_action_dg_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
-
-
---
--- Table structure for table `CONFIG_CONTENT`
---
-
-CREATE TABLE IF NOT EXISTS `CONFIG_CONTENT` (
-  `config_content_id` int(11) NOT NULL AUTO_INCREMENT,
-  `request_id` varchar(50) NOT NULL,
-  `content_type` varchar(50) NOT NULL,
-  `template_name` varchar(50) DEFAULT NULL,
-  `originator_id` varchar(50) DEFAULT NULL,
-  `service_description` varchar(100) DEFAULT NULL,
-  `action` varchar(50) DEFAULT NULL,
-  `creation_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `service_type` varchar(50) DEFAULT NULL,
-  `service_instance_id` varchar(50) DEFAULT NULL,
-  `vnf_id` varchar(50) DEFAULT NULL,
-  `vnf_name` varchar(50) DEFAULT NULL,
-  `vm_name` varchar(50) DEFAULT NULL,
-  `vnf_type` varchar(50) DEFAULT NULL,
-  `vnfc_type` varchar(50) DEFAULT NULL,
-  `host_ip_address` varchar(50) DEFAULT NULL,
-  `config_indicator` varchar(25) DEFAULT NULL,
-  `pending_delete` varchar(1) DEFAULT NULL,
-  `content` longtext,
-  PRIMARY KEY (`config_content_id`),
-  UNIQUE KEY `config_content_id` (`creation_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
---
--- Table structure for table `CONFIG_FILE_REFERENCE`
---
-
-CREATE TABLE IF NOT EXISTS `CONFIG_FILE_REFERENCE` (
-  `config_file_reference_id` int(11) NOT NULL AUTO_INCREMENT,
-  `site_location` varchar(50) DEFAULT NULL,
-  `vnf_type` varchar(50) DEFAULT NULL,
-  `import_type` varchar(50) DEFAULT NULL,
-  `file_type` varchar(50) DEFAULT NULL,
-  `source_server_name` varchar(255) DEFAULT NULL,
-  `source_file_path` varchar(255) DEFAULT NULL,
-  `target_file_path` varchar(255) DEFAULT NULL,
-  `name` varchar(50) DEFAULT NULL,
-  `file_name` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`config_file_reference_id`),
-  UNIQUE KEY `config_file_reference_id` (`config_file_reference_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `CONFIG_TRANSACTION_LOG`
---
-
-CREATE TABLE IF NOT EXISTS `CONFIG_TRANSACTION_LOG` (
-  `config_transaction_log_id` varchar(50) NOT NULL,
-  `request_id` varchar(50) DEFAULT NULL,
-  `message_type` varchar(100) DEFAULT NULL,
-  `creation_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `message` longtext,
-  PRIMARY KEY (`config_transaction_log_id`),
-  UNIQUE KEY `config_transaction_log_id` (`config_transaction_log_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=latin1;
-
-
---
--- Table structure for table `COUNTRY_ASN_MAPPING`
---
-
-CREATE TABLE IF NOT EXISTS `COUNTRY_ASN_MAPPING` (
-  `asn` int(5) NOT NULL,
-  `iso_2char` varchar(5) NOT NULL,
-  `iso_3char` varchar(5) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
-
-
---
--- Table structure for table `CUSTOMER2CONNECTION_MAPPING`
---
-
-CREATE TABLE IF NOT EXISTS `CUSTOMER2CONNECTION_MAPPING` (
-  `customer2connection_id` int(11) NOT NULL AUTO_INCREMENT,
-  `service_instance_id` varchar(80) NOT NULL,
-  `instance_type` varchar(20) NOT NULL,
-  `originating_service_instance_id` varchar(80) DEFAULT NULL,
-  `originating_service_type` varchar(20) DEFAULT NULL,
-  `service_type` varchar(30) DEFAULT NULL,
-  `connection_id` varchar(100) NOT NULL,
-  `status` varchar(20) DEFAULT NULL,
-  PRIMARY KEY (`customer2connection_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `CUSTOMER2CONNECTION_MAPPING_NEW`
---
-
-CREATE TABLE IF NOT EXISTS `CUSTOMER2CONNECTION_MAPPING_NEW` (
-  `customer2connection_id` int(11) NOT NULL AUTO_INCREMENT,
-  `service_instance_id` varchar(80) NOT NULL,
-  `instance_type` varchar(20) NOT NULL,
-  `originating_service_instance_id` varchar(80) DEFAULT NULL,
-  `originating_service_type` varchar(20) DEFAULT NULL,
-  `service_type` varchar(30) DEFAULT NULL,
-  `connection_id` varchar(100) NOT NULL,
-  `status` varchar(100) DEFAULT NULL,
-  PRIMARY KEY (`customer2connection_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `DATA_OBJECT_MAPPING`
---
-
-CREATE TABLE IF NOT EXISTS `DATA_OBJECT_MAPPING` (
-  `serial_key` int(11) NOT NULL AUTO_INCREMENT,
-  `data_object_key` varchar(100) NOT NULL,
-  `data_object_type` varchar(50) NOT NULL,
-  `service_type` varchar(50) NOT NULL,
-  `data_object_key2` varchar(100) NOT NULL,
-  `data_object_key2_type` varchar(50) NOT NULL,
-  `data_object_key3` varchar(100) DEFAULT NULL,
-  `data_object_key3_type` varchar(50) DEFAULT NULL,
-  `service` varchar(50) DEFAULT NULL,
-  PRIMARY KEY (`serial_key`),
-  KEY `IX1_DATA_OBJECT_MAPPING` (`data_object_key`,`data_object_type`,`service_type`),
-  KEY `IX2_DATA_OBJECT_MAPPING` (`service_type`,`data_object_key2`,`data_object_key2_type`)
-) ENGINE=InnoDB AUTO_INCREMENT=3211 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `DEVICE2CONNECTION_MAPPING`
---
-
-CREATE TABLE IF NOT EXISTS `DEVICE2CONNECTION_MAPPING` (
-  `vnf_host_name` varchar(100) NOT NULL,
-  `e2e_vpn_key` varchar(30) NOT NULL,
-  `service_type` varchar(30) NOT NULL,
-  `connection_id` varchar(100) NOT NULL,
-  PRIMARY KEY (`vnf_host_name`,`e2e_vpn_key`,`service_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `DEVICE2IPADDRESS_CONSUMPTION`
---
-
-CREATE TABLE IF NOT EXISTS `DEVICE2IPADDRESS_CONSUMPTION` (
-  `serial_key` int(11) NOT NULL AUTO_INCREMENT,
-  `device_id` varchar(100) NOT NULL,
-  `device_type` varchar(30) NOT NULL,
-  `ip_version` varchar(10) NOT NULL,
-  `consumption_key` varchar(100) NOT NULL,
-  `logical_interface_service_id` varchar(100) NOT NULL,
-  `address_type` varchar(30) NOT NULL,
-  `ip_consumed` varchar(50) NOT NULL,
-  `vnf_type` varchar(30) NOT NULL,
-  `secondary_key` varchar(100) DEFAULT NULL,
-  PRIMARY KEY (`serial_key`),
-  KEY `IX1_DEVICEIPADDRESS_CONSUMPTION` (`device_id`,`device_type`,`ip_version`)
-) ENGINE=InnoDB AUTO_INCREMENT=1357 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `DEVICE2IPADDRESS_MAPPING`
---
-
-CREATE TABLE IF NOT EXISTS `DEVICE2IPADDRESS_MAPPING` (
-  `serial_key` int(11) NOT NULL AUTO_INCREMENT,
-  `device_id` varchar(100) NOT NULL,
-  `device_type` varchar(30) NOT NULL,
-  `secondary_key` varchar(100) NOT NULL,
-  `secondary_key_type` varchar(30) NOT NULL,
-  `address` varchar(50) NOT NULL,
-  `address_type` varchar(30) NOT NULL,
-  `ip_version` varchar(10) NOT NULL,
-  `length` int(11) NOT NULL,
-  `status` varchar(30) NOT NULL,
-  PRIMARY KEY (`serial_key`),
-  KEY `IX1_DEVICE2IPADDRESS_MAPPING` (`device_id`,`device_type`,`secondary_key`,`secondary_key_type`,`address`,`address_type`)
-) ENGINE=InnoDB AUTO_INCREMENT=4734 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `DEVICE_AUTHENTICATION`
---
-
-CREATE TABLE IF NOT EXISTS `DEVICE_AUTHENTICATION` (
-  `device_authentication_id` int(11) NOT NULL AUTO_INCREMENT,
-  `vnf_type` varchar(50) DEFAULT NULL,
-  `user_name` varchar(50) DEFAULT NULL,
-  `password` varchar(100) DEFAULT NULL,
-  `protocol` varchar(100) DEFAULT NULL,
-  `port_number` int(11) DEFAULT NULL,
-  PRIMARY KEY (`device_authentication_id`),
-  UNIQUE KEY `device_authentication_id` (`device_authentication_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `DEVICE_INTERFACE_LOG`
---
-
-CREATE TABLE IF NOT EXISTS `DEVICE_INTERFACE_LOG` (
-  `device_interface_log_id` int(11) NOT NULL AUTO_INCREMENT,
-  `service_instance_id` varchar(50) DEFAULT NULL,
-  `request_id` varchar(50) DEFAULT NULL,
-  `creation_date` datetime NOT NULL,
-  `log` longtext,
-  PRIMARY KEY (`device_interface_log_id`),
-  UNIQUE KEY `device_interface_log_id` (`device_interface_log_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `DEVICE_INTERFACE_PROTOCOL`
---
-
-CREATE TABLE IF NOT EXISTS `DEVICE_INTERFACE_PROTOCOL` (
-  `device_interface_protocol_id` int(11) NOT NULL AUTO_INCREMENT,
-  `vnf_type` varchar(50) DEFAULT NULL,
-  `protocol` varchar(50) DEFAULT NULL,
-  `module` varchar(50) DEFAULT NULL,
-  `dg_rpc` varchar(50) DEFAULT NULL,
-  PRIMARY KEY (`device_interface_protocol_id`),
-  UNIQUE KEY `device_interface_protocol_id` (`device_interface_protocol_id`),
-  UNIQUE KEY `vnf_type` (`vnf_type`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `DOWNLOAD_CONFIG_TEMPLATE`
---
-
-CREATE TABLE IF NOT EXISTS `DOWNLOAD_CONFIG_TEMPLATE` (
-  `download_config_template_id` int(11) NOT NULL AUTO_INCREMENT,
-  `vnf_type` varchar(50) NOT NULL,
-  `protocol` varchar(50) NOT NULL,
-  `template` longtext,
-  PRIMARY KEY (`download_config_template_id`),
-  UNIQUE KEY `download_config_template_id` (`download_config_template_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `DOWNLOAD_DG_REFERENCE`
---
-
-CREATE TABLE IF NOT EXISTS `DOWNLOAD_DG_REFERENCE` (
-  `download_dg_reference_id` int(11) NOT NULL AUTO_INCREMENT,
-  `protocol` varchar(50) NOT NULL,
-  `download_config_dg` varchar(50) NOT NULL,
-  PRIMARY KEY (`download_dg_reference_id`),
-  UNIQUE KEY `download_dg_reference_id` (`download_dg_reference_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `EIPAM_CLIENT_KEY_INDEX`
---
-
-CREATE TABLE IF NOT EXISTS `EIPAM_CLIENT_KEY_INDEX` (
-  `vnf_name_prefix` varchar(100) NOT NULL,
-  `index_number` int(11) NOT NULL,
-  PRIMARY KEY (`vnf_name_prefix`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `EIPAM_IP_ASSIGNMENTS`
---
-
-CREATE TABLE IF NOT EXISTS `EIPAM_IP_ASSIGNMENTS` (
-  `plan_name` varchar(40) NOT NULL,
-  `client_key` varchar(100) NOT NULL,
-  `service_type` varchar(40) NOT NULL,
-  `ip_address` varchar(40) DEFAULT NULL,
-  `prefix_length` int(2) DEFAULT NULL,
-  `status` varchar(255) DEFAULT NULL,
-  `service_instance_id` varchar(80) DEFAULT NULL,
-  `last_modified_ts` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `prev_status` varchar(20) DEFAULT NULL,
-  `info` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`plan_name`,`client_key`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `EIPAM_IP_POOLS`
---
-
-CREATE TABLE IF NOT EXISTS `EIPAM_IP_POOLS` (
-  `pool_id` int(11) NOT NULL AUTO_INCREMENT,
-  `key_name` varchar(50) NOT NULL,
-  `key_value` varchar(255) NOT NULL,
-  `level` int(2) NOT NULL,
-  `plan_name` varchar(50) NOT NULL,
-  `address_family` varchar(10) NOT NULL,
-  `parent_pool` varchar(255) NOT NULL,
-  `service_instance_id` varchar(255) DEFAULT NULL,
-  `network_id` varchar(255) DEFAULT NULL,
-  `created_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `delete_failure` varchar(20) DEFAULT NULL,
-  `delete_request_id` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`pool_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=339 DEFAULT CHARSET=latin1 COMMENT='This table will capture the pools being created by SDN-C in EIPAM_IP_POOLS. There is no data migration for existing vPE pool data.';
-
---
--- Table structure for table `EIPAM_IP_SUBNETS`
---
-
-CREATE TABLE IF NOT EXISTS `EIPAM_IP_SUBNETS` (
-  `entity_id` int(6) NOT NULL,
-  `service_type` varchar(40) NOT NULL,
-  `plan_name` varchar(50) NOT NULL,
-  `address_family` varchar(10) NOT NULL,
-  `ip_address` varchar(40) NOT NULL,
-  `prefix_length` int(3) NOT NULL,
-  `status` varchar(20) NOT NULL,
-  `last_modified_ts` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `network_id` varchar(255) DEFAULT NULL,
-  `pool_id` int(11) DEFAULT NULL,
-  `dealloc_failure` varchar(20) DEFAULT NULL,
-  `dealloc_request_id` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`entity_id`),
-  KEY `FK_EIPAM_IP_SUBNETS_EIPAM_IP_POOLS` (`pool_id`),
-  CONSTRAINT `EIPAM_IP_SUBNETS_ibfk_1` FOREIGN KEY (`pool_id`) REFERENCES `EIPAM_IP_POOLS` (`pool_id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
-  CONSTRAINT `FK_EIPAM_IP_SUBNETS_EIPAM_IP_POOLS` FOREIGN KEY (`pool_id`) REFERENCES `EIPAM_IP_POOLS` (`pool_id`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `EIPAM_IP_SUBNET_KEYS`
---
-
-CREATE TABLE IF NOT EXISTS `EIPAM_IP_SUBNET_KEYS` (
-  `entity_id` int(6) NOT NULL,
-  `key_name` varchar(50) NOT NULL,
-  `key_value` varchar(255) NOT NULL,
-  `level` int(2) NOT NULL,
-  PRIMARY KEY (`entity_id`,`key_name`,`key_value`,`level`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `EIPAM_REQUEST_KEY`
---
-
-CREATE TABLE IF NOT EXISTS `EIPAM_REQUEST_KEY` (
-  `key_name_1` varchar(50) NOT NULL,
-  `address_family` varchar(4) NOT NULL,
-  `serial_key` int(2) NOT NULL AUTO_INCREMENT,
-  `plan_name` varchar(50) NOT NULL,
-  `request_length` int(2) NOT NULL,
-  `pools_length` int(2) NOT NULL,
-  `plan_length` int(2) NOT NULL,
-  `key_name_0` varchar(50) NOT NULL,
-  `key_name_type_0` varchar(255) NOT NULL,
-  `key_name_type_1` varchar(255) NOT NULL,
-  `prefix_length` int(2) NOT NULL,
-  `group_flag` char(1) NOT NULL,
-  `address_type` varchar(20) DEFAULT NULL,
-  PRIMARY KEY (`key_name_1`,`address_family`),
-  UNIQUE KEY `IX1_EIPAM_REQUEST_KEY` (`serial_key`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `EXTERNAL_DATA`
---
-
-CREATE TABLE IF NOT EXISTS `EXTERNAL_DATA` (
-  `external_data_id` int(11) NOT NULL AUTO_INCREMENT,
-  `request_id` int(11) DEFAULT NULL,
-  `param_name` varchar(30) NOT NULL,
-  `param_value` varchar(50) NOT NULL,
-  PRIMARY KEY (`external_data_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `FLOW_UPDATES`
---
-
-CREATE TABLE IF NOT EXISTS `FLOW_UPDATES` (
-  `seq` int(11) NOT NULL AUTO_INCREMENT,
-  `status` enum('NEW','COMPLETE','FAILED') NOT NULL DEFAULT 'NEW',
-  `create_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `last_processed_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `odl` varchar(128) DEFAULT NULL,
-  `address_family` enum('IPV4','IPV6') DEFAULT NULL,
-  `destination_prefix` varchar(50) DEFAULT NULL,
-  `communities` varchar(6000) DEFAULT NULL,
-  `route_key` varchar(50) DEFAULT NULL,
-  PRIMARY KEY (`seq`)
-) ENGINE=InnoDB AUTO_INCREMENT=276 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `GENERIC_L3_NETWORK`
---
-
-CREATE TABLE IF NOT EXISTS `GENERIC_L3_NETWORK` (
-  `network_id` varchar(80) NOT NULL,
-  `network_name` varchar(80) DEFAULT NULL,
-  `network_type` varchar(80) DEFAULT NULL,
-  `network_role` varchar(80) DEFAULT NULL,
-  `network_technology` varchar(80) DEFAULT NULL,
-  `neutron_network_id` varchar(80) DEFAULT NULL,
-  `is_bound_to_vpn` tinyint(1) DEFAULT NULL,
-  `orchestration_status` varchar(20) DEFAULT NULL,
-  `heat_stack_id` varchar(80) DEFAULT NULL,
-  `mso_catalog_key` varchar(80) DEFAULT NULL,
-  `service_id` varchar(80) NOT NULL,
-  `tenant_id` varchar(80) NOT NULL,
-  `physical_location_id` varchar(20) DEFAULT NULL,
-  `network_role_instance` varchar(80) NOT NULL,
-  PRIMARY KEY (`network_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `GENERIC_L3_NETWORK_SUBNET`
---
-
-CREATE TABLE IF NOT EXISTS `GENERIC_L3_NETWORK_SUBNET` (
-  `network_id` varchar(80) NOT NULL,
-  `subnet_id` varchar(80) NOT NULL,
-  `neutron_subnet_id` varchar(80) DEFAULT NULL,
-  `gateway_address` varchar(45) NOT NULL,
-  `network_start_address` varchar(45) NOT NULL,
-  `cidr_mask` varchar(20) NOT NULL,
-  `ip_version` char(1) NOT NULL,
-  `orchestration_status` varchar(64) NOT NULL,
-  `dhcp_enabled` tinyint(1) NOT NULL,
-  `dhcp_start` varchar(45) DEFAULT NULL,
-  `dhcp_end` varchar(45) DEFAULT NULL,
-  PRIMARY KEY (`network_id`,`subnet_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `GENERIC_L3_NETWORK_VPN_BINDING`
---
-
-CREATE TABLE IF NOT EXISTS `GENERIC_L3_NETWORK_VPN_BINDING` (
-  `network_id` varchar(80) NOT NULL,
-  `vpn_id` varchar(80) NOT NULL,
-  PRIMARY KEY (`network_id`,`vpn_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `GENERIC_RESOURCE_NAME`
---
-
-CREATE TABLE IF NOT EXISTS `GENERIC_RESOURCE_NAME` (
-  `type` varchar(50) NOT NULL,
-  `name` varchar(255) NOT NULL,
-  `prefix` varchar(255) NULL,
-  `name_index` int(11) NULL,
-  `context_id` varchar(255) NULL,
-  PRIMARY KEY (`type`,`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `GENERIC_VNF`
---
-
-CREATE TABLE IF NOT EXISTS `GENERIC_VNF` (
-  `vnf_id` varchar(80) NOT NULL,
-  `vnf_name` varchar(80) NOT NULL,
-  `vnf_type` varchar(200) NOT NULL,
-  `vnf_name2` varchar(80) DEFAULT NULL,
-  `service_id` varchar(80) NOT NULL,
-  `equipment_role` varchar(80) NOT NULL,
-  `orchestration_status` varchar(20) DEFAULT NULL,
-  `prov_status` varchar(20) DEFAULT NULL,
-  `heat_stack_id` varchar(80) DEFAULT NULL,
-  `mso_catalog_key` varchar(80) DEFAULT NULL,
-  `regional_resource_zone` varchar(80) DEFAULT NULL,
-  `operational_state` varchar(80) DEFAULT NULL,
-  `license_key` varchar(80) DEFAULT NULL,
-  `ipv4_oam_address` varchar(20) DEFAULT NULL,
-  `ipv4_loopback0_address` varchar(20) DEFAULT NULL,
-  `nm_lan_v6_address` varchar(40) DEFAULT NULL,
-  `management_v6_address` varchar(40) DEFAULT NULL,
-  `management_option` varchar(45) DEFAULT NULL,
-  `vcpu` varchar(45) DEFAULT NULL,
-  `vmemory` varchar(45) DEFAULT NULL,
-  `vdisk` varchar(45) DEFAULT NULL,
-  `vcpu_units` varchar(45) DEFAULT NULL,
-  `vmemory_units` varchar(45) DEFAULT NULL,
-  `vdisk_units` varchar(45) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `GENERIC_VNF_L3_NETWORK`
---
-
-CREATE TABLE IF NOT EXISTS `GENERIC_VNF_L3_NETWORK` (
-  `vnf_id` varchar(80) NOT NULL,
-  `network_id` varchar(80) NOT NULL,
-  PRIMARY KEY (`vnf_id`,`network_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `GENERIC_VNF_LICENSE_MANAGEMENT`
---
-
-CREATE TABLE IF NOT EXISTS `GENERIC_VNF_LICENSE_MANAGEMENT` (
-  `vnf_id` varchar(80) NOT NULL,
-  `att_uuid` varchar(80) NOT NULL,
-  PRIMARY KEY (`vnf_id`,`att_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `GENERIC_VNF_LINTERFACE`
---
-
-CREATE TABLE IF NOT EXISTS `GENERIC_VNF_LINTERFACE` (
-  `vnf_id` varchar(80) NOT NULL,
-  `interface_name` varchar(255) NOT NULL,
-  `interface_role` varchar(45) DEFAULT NULL,
-  `v6_wan_link_ip` varchar(45) DEFAULT NULL,
-  `selflink` varchar(128) DEFAULT NULL,
-  `interface_id` varchar(45) DEFAULT NULL,
-  `macaddr` varchar(64) DEFAULT NULL,
-  `network_name` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`,`interface_name`),
-  KEY `FK_GENERIC_VNF_LINTERFACE_GENERIC_VNF_IDX` (`vnf_id`),
-  CONSTRAINT `FK_GENERIC_VNF_LINTERFACE_GENERIC_VNF` FOREIGN KEY (`vnf_id`) REFERENCES `GENERIC_VNF` (`vnf_id`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `GENERIC_VNF_PSERVER`
---
-
-CREATE TABLE IF NOT EXISTS `GENERIC_VNF_PSERVER` (
-  `vnf_id` varchar(64) NOT NULL,
-  `hostname` varchar(255) NOT NULL,
-  PRIMARY KEY (`vnf_id`,`hostname`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `GENERIC_VNF_SERVICE_INSTANCE`
---
-
-CREATE TABLE IF NOT EXISTS `GENERIC_VNF_SERVICE_INSTANCE` (
-  `vnf_id` varchar(64) NOT NULL,
-  `service_instance_id` varchar(255) NOT NULL,
-  `relationship_key` varchar(64) NOT NULL,
-  `relationship_value` varchar(64) DEFAULT NULL,
-  `global_customer_id` varchar(255) DEFAULT NULL,
-  `service_type` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`,`service_instance_id`,`relationship_key`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `GENERIC_VNF_VNF_IMAGE`
---
-
-CREATE TABLE IF NOT EXISTS `GENERIC_VNF_VNF_IMAGE` (
-  `vnf_id` varchar(64) NOT NULL,
-  `att_uuid` varchar(255) NOT NULL,
-  PRIMARY KEY (`vnf_id`,`att_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `GENERIC_VNF_VSERVER`
---
-
-CREATE TABLE IF NOT EXISTS `GENERIC_VNF_VSERVER` (
-  `vnf_id` varchar(80) NOT NULL,
-  `vserver_id` varchar(128) NOT NULL,
-  `tenant_id` varchar(128) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`,`vserver_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `GENERIC_VPN_BINDING`
---
-
-CREATE TABLE IF NOT EXISTS `GENERIC_VPN_BINDING` (
-  `vpn_id` varchar(80) NOT NULL,
-  `vpn_name` varchar(80) NOT NULL,
-  `global_route_target` varchar(80) NOT NULL,
-  PRIMARY KEY (`vpn_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `GET_CONFIG_TEMPLATE`
---
-
-CREATE TABLE IF NOT EXISTS `GET_CONFIG_TEMPLATE` (
-  `get_config_template_id` int(11) NOT NULL AUTO_INCREMENT,
-  `vnf_type` varchar(50) NOT NULL,
-  `device_interface_protocol_id` int(11) NOT NULL,
-  `xml_processing` varchar(1) DEFAULT NULL,
-  `xml_protocol` varchar(30) DEFAULT NULL,
-  `template` longtext,
-  PRIMARY KEY (`get_config_template_id`),
-  UNIQUE KEY `get_config_template_id` (`get_config_template_id`),
-  KEY `get_config_template_ibfk_1` (`device_interface_protocol_id`),
-  CONSTRAINT `get_config_template_ibfk_1` FOREIGN KEY (`device_interface_protocol_id`) REFERENCES `DEVICE_INTERFACE_PROTOCOL` (`device_interface_protocol_id`) ON DELETE NO ACTION ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `LOCATION`
---
-
-CREATE TABLE IF NOT EXISTS `LOCATION` (
-  `loc_id` int(11) NOT NULL AUTO_INCREMENT,
-  `address` varchar(150) NOT NULL,
-  `city_code_id` int(11) NOT NULL,
-  `create_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`loc_id`),
-  KEY `IN1_LOCATION_IDX` (`city_code_id`),
-  CONSTRAINT `FK1_LOCATION` FOREIGN KEY (`city_code_id`) REFERENCES `CITY_CODE` (`city_code_id`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB AUTO_INCREMENT=327 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `HOSTNAME`
---
-
-CREATE TABLE IF NOT EXISTS `HOSTNAME` (
-  `hostname` varchar(21) NOT NULL,
-  `parent_hostname` varchar(21) DEFAULT NULL,
-  `cust_id` int(11) NOT NULL,
-  `loc_id` int(11) NOT NULL,
-  `site_sequence` varchar(2) NOT NULL,
-  `server_sequence` varchar(2) NOT NULL,
-  `activation_code` varchar(11) DEFAULT NULL,
-  `vnf_sequence` varchar(2) DEFAULT NULL,
-  `vendor_code` varchar(1) NOT NULL,
-  `virtual_device_type` varchar(2) DEFAULT NULL,
-  `device_sequence` varchar(3) DEFAULT NULL,
-  `create_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`hostname`),
-  KEY `IN1_HOSTNAME` (`cust_id`),
-  KEY `IN2_HOSTNAME` (`loc_id`),
-  KEY `IN3_HOSTNAME` (`vendor_code`),
-  KEY `IN4_HOSTNAME` (`parent_hostname`),
-  CONSTRAINT `FK1_HOSTNAME` FOREIGN KEY (`cust_id`) REFERENCES `CUSTOMER` (`cust_id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
-  CONSTRAINT `FK2_HOSTNAME` FOREIGN KEY (`loc_id`) REFERENCES `LOCATION` (`loc_id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
-  CONSTRAINT `FK4_HOSTNAME` FOREIGN KEY (`parent_hostname`) REFERENCES `HOSTNAME` (`hostname`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `IPV4_ADDRESS_POOL`
---
-
-CREATE TABLE IF NOT EXISTS `IPV4_ADDRESS_POOL` (
-  `aic_site_id` varchar(100) NOT NULL,
-  `universe` varchar(40) NOT NULL,
-  `status` varchar(40) NOT NULL,
-  `ipv4_addr` varchar(20) NOT NULL,
-  PRIMARY KEY (`ipv4_addr`,`universe`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `LINK_MASTER`
---
-
-CREATE TABLE IF NOT EXISTS `LINK_MASTER` (
-  `link_interface_ip` varchar(20) NOT NULL,
-  `source_crs_name` varchar(20) NOT NULL,
-  `destination_crs_name` varchar(20) NOT NULL,
-  `max_reserved_bw` int(11) DEFAULT NULL,
-  `default_cost` int(11) DEFAULT NULL,
-  `bundle_name` varchar(20) DEFAULT NULL,
-  PRIMARY KEY (`link_interface_ip`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `LINTERFACE_VLAN`
---
-
-CREATE TABLE IF NOT EXISTS `LINTERFACE_VLAN` (
-  `vnf_id` varchar(80) NOT NULL,
-  `interface_name` varchar(255) NOT NULL,
-  `vlan_interface` varchar(255) NOT NULL,
-  `vlan_id_inner` varchar(64) DEFAULT NULL,
-  `vlan_id_outer` varchar(64) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`,`interface_name`,`vlan_interface`),
-  KEY `FK_LINTERFACE_VLAN_GENERIC_VNF_LINTERFACE_IDX` (`vnf_id`,`interface_name`),
-  CONSTRAINT `FK_LINTERFACE_VLAN_GENERIC_VNF_LINTERFACE` FOREIGN KEY (`vnf_id`, `interface_name`) REFERENCES `GENERIC_VNF_LINTERFACE` (`vnf_id`, `interface_name`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
---
--- Table structure for table `MAX_PORT_SPEED`
---
-
-CREATE TABLE IF NOT EXISTS `MAX_PORT_SPEED` (
-  `max_port_speed_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `image_file_name` varchar(50) NOT NULL,
-  `end_point_position` varchar(50) NOT NULL,
-  `interface_name` varchar(100) NOT NULL,
-  `max_speed` bigint(20) NOT NULL,
-  `unit` varchar(10) NOT NULL,
-  PRIMARY KEY (`max_port_speed_id`),
-  UNIQUE KEY `max_port_speed_id` (`max_port_speed_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `MAX_SERVER_SPEED`
---
-
-CREATE TABLE IF NOT EXISTS `MAX_SERVER_SPEED` (
-  `max_server_speed_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `server_model` varchar(50) NOT NULL,
-  `evc_count` smallint(6) NOT NULL,
-  `max_speed` bigint(20) NOT NULL,
-  `unit` varchar(10) NOT NULL,
-  `description` varchar(500) DEFAULT NULL,
-  PRIMARY KEY (`max_server_speed_id`),
-  UNIQUE KEY `max_server_speed_id` (`max_server_speed_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NAMING_POLICY_VM_NAME_INDEX`
---
-
-CREATE TABLE IF NOT EXISTS `NAMING_POLICY_VM_NAME_INDEX` (
-  `vm_name_prefix` varchar(255) NOT NULL,
-  `index_number` int(11) NOT NULL,
-  PRIMARY KEY (`vm_name_prefix`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NAMING_POLICY_VNFC_NAME_INDEX`
---
-
-CREATE TABLE IF NOT EXISTS `NAMING_POLICY_VNFC_NAME_INDEX` (
-  `vnfc_name_prefix` varchar(255) NOT NULL,
-  `index_number` int(11) NOT NULL,
-  PRIMARY KEY (`vnfc_name_prefix`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NBNC_ASSIGN_VPN_OVERRIDE`
---
-
-CREATE TABLE IF NOT EXISTS `NBNC_ASSIGN_VPN_OVERRIDE` (
-  `vpn_id` varchar(12) NOT NULL DEFAULT '',
-  `vpn_rt` varchar(16) NOT NULL DEFAULT '',
-  `service_type` varchar(16) NOT NULL DEFAULT '',
-  `be_location` varchar(16) NOT NULL DEFAULT '',
-  `be_type` varchar(32) NOT NULL DEFAULT '',
-  `be_id` varchar(32) DEFAULT NULL,
-  `description` varchar(128) DEFAULT NULL,
-  PRIMARY KEY (`vpn_id`,`vpn_rt`,`service_type`,`be_location`,`be_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NBNC_BORDER_ELEMENT`
---
-
-CREATE TABLE IF NOT EXISTS `NBNC_BORDER_ELEMENT` (
-  `be_id` varchar(32) NOT NULL,
-  `be_type` varchar(16) NOT NULL,
-  `be_name` varchar(32) DEFAULT NULL,
-  `be_host_vnf_id` varchar(32) DEFAULT NULL,
-  `service_type` varchar(16) DEFAULT NULL,
-  `tangibility` varchar(16) DEFAULT NULL,
-  `usage_order` smallint(6) DEFAULT NULL,
-  `vlan_start` smallint(6) DEFAULT NULL,
-  `vlan_end` smallint(6) DEFAULT NULL,
-  `ipv4_subnet` varchar(18) DEFAULT NULL,
-  `ipv6_subnet` varchar(68) DEFAULT NULL,
-  `network_ip` varchar(48) DEFAULT NULL,
-  `be_location` varchar(16) DEFAULT NULL,
-  `description` varchar(128) DEFAULT NULL,
-  `updated_timestamp` timestamp NULL DEFAULT NULL,
-  `log_link_model_uuid` varchar(64) DEFAULT NULL,
-  PRIMARY KEY (`be_id`,`be_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NBNC_IPE`
---
-
-CREATE TABLE IF NOT EXISTS `NBNC_IPE` (
-  `ipe_name` varchar(32) NOT NULL,
-  `ipe_location` varchar(16) DEFAULT NULL,
-  `ipe_ip_address` varchar(16) DEFAULT NULL,
-  `ipe_id` varchar(8) DEFAULT NULL,
-  `service_type_array` varchar(512) DEFAULT NULL,
-  `ipe_status` varchar(32) DEFAULT NULL,
-  `updated_timestamp` timestamp NULL DEFAULT NULL,
-  PRIMARY KEY (`ipe_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NBNC_IPE_PORT`
---
-
-CREATE TABLE IF NOT EXISTS `NBNC_IPE_PORT` (
-  `port_id` varchar(16) NOT NULL,
-  `ipe_name` varchar(32) NOT NULL,
-  `be_id` varchar(32) NOT NULL,
-  `be_type` varchar(16) NOT NULL,
-  `port_type` varchar(16) DEFAULT NULL,
-  `ae_name` varchar(16) DEFAULT NULL,
-  `description` varchar(128) DEFAULT NULL,
-  `updated_timestamp` timestamp NULL DEFAULT NULL,
-  PRIMARY KEY (`port_id`,`ipe_name`,`be_id`,`be_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NBNC_MAPPING_SBG_BGF`
---
-
-CREATE TABLE IF NOT EXISTS `NBNC_MAPPING_SBG_BGF` (
-  `asbg_vlan` smallint(6) NOT NULL,
-  `bgf_vlan` smallint(6) NOT NULL,
-  PRIMARY KEY (`asbg_vlan`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NBNC_SERVICE`
---
-
-CREATE TABLE IF NOT EXISTS `NBNC_SERVICE` (
-  `service_type` varchar(16) NOT NULL,
-  `service_model_uuid` varchar(64) NOT NULL,
-  `description` varchar(128) DEFAULT NULL,
-  `created_timestamp` timestamp NULL DEFAULT NULL,
-  `updated_timestamp` timestamp NULL DEFAULT NULL,
-  PRIMARY KEY (`service_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NBNC_SERVICE_VLAN`
---
-
-CREATE TABLE IF NOT EXISTS `NBNC_SERVICE_VLAN` (
-  `be_id` varchar(32) NOT NULL,
-  `vlan` smallint(6) NOT NULL,
-  `service_type` varchar(16) DEFAULT NULL,
-  `be_type` varchar(16) DEFAULT NULL,
-  `be_name` varchar(32) DEFAULT NULL,
-  `be_host_vnf_id` varchar(32) DEFAULT NULL,
-  `be_location` varchar(16) DEFAULT NULL,
-  `be_usage_order` smallint(6) DEFAULT NULL,
-  `vlan_usage_order` smallint(6) DEFAULT NULL,
-  `status` varchar(16) DEFAULT 'AVAILABLE',
-  `request_id` varchar(64) DEFAULT NULL,
-  `service_instance_id` varchar(64) DEFAULT NULL,
-  `vni_id` varchar(16) DEFAULT NULL,
-  `customer_id` varchar(16) DEFAULT NULL,
-  `ipe1_router_name` varchar(32) DEFAULT NULL,
-  `ipe1_port_id` varchar(16) DEFAULT NULL,
-  `ipe1_ae_name` varchar(16) DEFAULT NULL,
-  `ipe2_router_name` varchar(32) DEFAULT NULL,
-  `ipe2_port_id` varchar(16) DEFAULT NULL,
-  `ipe2_ae_name` varchar(16) DEFAULT NULL,
-  `available_timestamp` timestamp NULL DEFAULT NULL,
-  `allocated_timestamp` timestamp NULL DEFAULT NULL,
-  `disabled_timestamp` timestamp NULL DEFAULT NULL,
-  `enabled_timestamp` timestamp NULL DEFAULT NULL,
-  `vpn_id` varchar(12) DEFAULT NULL,
-  `vpn_rt` varchar(16) DEFAULT NULL,
-  PRIMARY KEY (`be_id`,`vlan`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NCS_EXPECTED_ASYNC_REQUESTS`
---
-
-CREATE TABLE IF NOT EXISTS `NCS_EXPECTED_ASYNC_REQUESTS` (
-  `ncs_request_id` varchar(255) NOT NULL,
-  `mso_gp_request_id` varchar(255) NOT NULL,
-  `service_instance_id` varchar(255) NOT NULL,
-  `sdn_module_name` varchar(255) NOT NULL,
-  `sdn_rpc_name` varchar(255) NOT NULL,
-  `sdn_service_action` varchar(255) DEFAULT NULL,
-  `ncs_rpc` varchar(255) NOT NULL,
-  `ncs_sub_action` varchar(255) DEFAULT NULL,
-  `status` varchar(255) NOT NULL DEFAULT 'inProgress',
-  `creation_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`ncs_request_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NETWORK_INSTANCE_NAME_INDEX`
---
-
-CREATE TABLE IF NOT EXISTS `NETWORK_INSTANCE_NAME_INDEX` (
-  `network_instance_name_prefix` varchar(255) NOT NULL,
-  `index_number` int(11) NOT NULL,
-  PRIMARY KEY (`network_instance_name_prefix`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
---
--- Table structure for table `SERVICE_MODEL`
---
-
-CREATE TABLE IF NOT EXISTS `SERVICE_MODEL` (
-  `service_uuid` varchar(255) NOT NULL,
-  `model_yaml` longblob,
-  `invariant_uuid` varchar(255) DEFAULT NULL,
-  `version` varchar(255) DEFAULT NULL,
-  `name` varchar(255) DEFAULT NULL,
-  `description` varchar(1024) DEFAULT NULL,
-  `type` varchar(255) DEFAULT NULL,
-  `category` varchar(255) DEFAULT NULL,
-  `ecomp_naming` char(1) DEFAULT NULL,
-  `service_instance_name_prefix` varchar(255) DEFAULT NULL,
-  `filename` varchar(100) DEFAULT NULL,
-  `naming_policy` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`service_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NETWORK_MODEL`
---
-
-CREATE TABLE IF NOT EXISTS `NETWORK_MODEL` (
-  `customization_uuid` varchar(255) NOT NULL,
-  `service_uuid` varchar(255) NOT NULL,
-  `model_yaml` longblob,
-  `invariant_uuid` varchar(255) DEFAULT NULL,
-  `uuid` varchar(255) DEFAULT NULL,
-  `network_type` varchar(255) DEFAULT NULL,
-  `network_role` varchar(255) DEFAULT NULL,
-  `network_technology` varchar(255) DEFAULT NULL,
-  `trunk_network_indicator` char(1) DEFAULT NULL,
-  `network_scope` varchar(255) DEFAULT NULL,
-  `naming_policy` varchar(255) DEFAULT NULL,
-  `ecomp_generated_naming` char(1) DEFAULT NULL,
-  `is_shared_network` char(1) DEFAULT NULL,
-  `is_external_network` char(1) DEFAULT NULL,
-  `is_provider_network` char(1) DEFAULT NULL,
-  `physical_network_name` varchar(255) DEFAULT NULL,
-  `is_bound_to_vpn` char(1) DEFAULT NULL,
-  `vpn_binding` varchar(255) DEFAULT NULL,
-  `use_ipv4` char(1) DEFAULT NULL,
-  `ipv4_dhcp_enabled` char(1) DEFAULT NULL,
-  `ipv4_ip_version` char(1) DEFAULT NULL,
-  `ipv4_cidr_mask` varchar(255) DEFAULT NULL,
-  `eipam_v4_address_plan` varchar(255) DEFAULT NULL,
-  `use_ipv6` char(1) DEFAULT NULL,
-  `ipv6_dhcp_enabled` char(1) DEFAULT NULL,
-  `ipv6_ip_version` char(1) DEFAULT NULL,
-  `ipv6_cidr_mask` varchar(255) DEFAULT NULL,
-  `eipam_v6_address_plan` varchar(255) DEFAULT NULL,
-  `version` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`customization_uuid`),
-  KEY `FK_NETWORK_MODEL` (`service_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NETWORK_PROFILE`
---
-
-CREATE TABLE IF NOT EXISTS `NETWORK_PROFILE` (
-  `network_type` varchar(100) NOT NULL,
-  `technology` varchar(100) NOT NULL,
-  PRIMARY KEY (`network_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NETWORK_ROLE_VPN_BINDING`
---
-
-CREATE TABLE IF NOT EXISTS `NETWORK_ROLE_VPN_BINDING` (
-  `network_role` varchar(80) NOT NULL,
-  `vpn_id` varchar(80) NOT NULL,
-  PRIMARY KEY (`network_role`,`vpn_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `NODE_TYPES`
---
-
-CREATE TABLE IF NOT EXISTS `NODE_TYPES` (
-  `nodetype` varchar(80) NOT NULL,
-  PRIMARY KEY (`nodetype`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `OBJECT_GROUPING`
---
-
-CREATE TABLE IF NOT EXISTS `OBJECT_GROUPING` (
-  `group_id` varchar(128) NOT NULL,
-  `group_type` varchar(128) NOT NULL,
-  PRIMARY KEY (`group_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `OBJECT_GROUP_MEMBER_TRACKING`
---
-
-CREATE TABLE IF NOT EXISTS `OBJECT_GROUP_MEMBER_TRACKING` (
-  `group_id` varchar(128) NOT NULL,
-  `key_id` varchar(128) NOT NULL,
-  `key_type` varchar(128) NOT NULL,
-  PRIMARY KEY (`group_id`,`key_id`,`key_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `PARAMETERS`
---
-
-CREATE TABLE IF NOT EXISTS `PARAMETERS` (
-  `name` varchar(100) NOT NULL,
-  `value` varchar(128) NOT NULL,
-  `category` varchar(24) DEFAULT NULL,
-  `memo` varchar(128) DEFAULT NULL,
-  PRIMARY KEY (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `PE_INV`
---
-
-CREATE TABLE IF NOT EXISTS `PE_INV` (
-  `EQUIP_ID` int(11) DEFAULT NULL,
-  `EQUIP_TYPE` varchar(20) DEFAULT NULL,
-  `PTNII_EQUIP_NAME` varchar(20) DEFAULT NULL,
-  `IP_ADDR` varchar(15) DEFAULT NULL,
-  `ROUTER_PROV_STATUS` varchar(50) DEFAULT NULL,
-  `REGION` varchar(16) DEFAULT NULL,
-  `COUNTRY_ABBR` varchar(50) DEFAULT NULL,
-  `EQUIP_NAME_CODE` varchar(50) DEFAULT NULL,
-  `AS_NUMBER` varchar(5) DEFAULT NULL,
-  `LOOPBACK1` varchar(15) DEFAULT NULL,
-  `LOOPBACK2` varchar(15) DEFAULT NULL,
-  `LOOPBACK3` varchar(15) DEFAULT NULL,
-  `LOOPBACK40` varchar(15) DEFAULT NULL,
-  `LOOPBACK65535` varchar(15) DEFAULT NULL,
-  `INMS_LIST` varchar(20) DEFAULT NULL,
-  `ENCRYPTED_ACCESS_FLAG` varchar(50) DEFAULT NULL,
-  `SW_NAME` varchar(100) DEFAULT NULL,
-  `NMIPADDR` varchar(15) DEFAULT NULL,
-  `CREATE_DATE` datetime DEFAULT NULL,
-  `MOD_DATE` datetime DEFAULT NULL,
-  `FCN_CODE` varchar(50) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `PHYSICAL_LINK`
---
-
-CREATE TABLE IF NOT EXISTS `PHYSICAL_LINK` (
-  `link_name` varchar(255) NOT NULL,
-  `speed_value` varchar(64) DEFAULT NULL,
-  `speed_units` varchar(64) DEFAULT NULL,
-  `circuit_id` varchar(255) NOT NULL,
-  `dual_mode` varchar(64) NOT NULL,
-  PRIMARY KEY (`link_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `PHYSICAL_LINK_PINTERFACE`
---
-
-CREATE TABLE IF NOT EXISTS `PHYSICAL_LINK_PINTERFACE` (
-  `link_name` varchar(255) NOT NULL,
-  `hostname` varchar(255) NOT NULL,
-  `port_name_ft` varchar(255) NOT NULL,
-  PRIMARY KEY (`link_name`,`hostname`,`port_name_ft`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `PINTERFACE`
---
-
-CREATE TABLE IF NOT EXISTS `PINTERFACE` (
-  `hostname` varchar(255) NOT NULL,
-  `port_name_ft` varchar(255) NOT NULL,
-  `interface_name` varchar(255) DEFAULT '',
-  `physical_speed` varchar(255) DEFAULT '',
-  `physical_units` varchar(255) DEFAULT '',
-  `port_description` varchar(255) DEFAULT '',
-  PRIMARY KEY (`hostname`,`port_name_ft`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `POLICY_UPDATE_NOTIFICATION`
---
-
-CREATE TABLE IF NOT EXISTS `POLICY_UPDATE_NOTIFICATION` (
-  `policy_name` varchar(255) NOT NULL,
-  `version_id` varchar(255) NOT NULL,
-  `update_type` varchar(255) NOT NULL,
-  `timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`policy_name`,`version_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `PORTAL_USERS`
---
-
-CREATE TABLE IF NOT EXISTS `PORTAL_USERS` (
-  `email` varchar(64) NOT NULL,
-  `password` varbinary(255) NOT NULL,
-  `privilege` char(1) NOT NULL,
-  PRIMARY KEY (`email`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
---
--- Table structure for table `PREPARE_FILE_RELATIONSHIP`
---
-
-CREATE TABLE IF NOT EXISTS `PREPARE_FILE_RELATIONSHIP` (
-  `prepare_file_relationship_id` int(11) NOT NULL AUTO_INCREMENT,
-  `service_instance_id` varchar(50) DEFAULT NULL,
-  `request_id` varchar(255) DEFAULT NULL,
-  `config_file_id` int(11) DEFAULT NULL,
-  `asdc_artifacts_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`prepare_file_relationship_id`),
-  UNIQUE KEY `prepare_file_relationship_id` (`prepare_file_relationship_id`),
-  KEY `ie_prepare_file_relationship` (`config_file_id`),
-  KEY `ie2_prepare_file_relationship` (`asdc_artifacts_id`),
-  CONSTRAINT `prepare_file_relationship_ibfk_2` FOREIGN KEY (`asdc_artifacts_id`) REFERENCES `ASDC_ARTIFACTS` (`asdc_artifacts_id`) ON DELETE NO ACTION ON UPDATE CASCADE,
-  CONSTRAINT `prepare_file_replationship_ibfk_1` FOREIGN KEY (`config_file_id`) REFERENCES `CONFIGFILES` (`config_file_id`) ON DELETE NO ACTION ON UPDATE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `PRE_LOAD_VNF_DATA`
---
-
-CREATE TABLE IF NOT EXISTS `PRE_LOAD_VNF_DATA` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `svc_request_id` varchar(100) DEFAULT '',
-  `svc_action` varchar(40) DEFAULT '',
-  `status` varchar(10) NOT NULL DEFAULT 'pending',
-  `filename` varchar(100) NOT NULL,
-  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `preload_data` longblob,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=295 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `PRE_LOAD_VNF_NETWORK_DATA`
---
-
-CREATE TABLE IF NOT EXISTS `PRE_LOAD_VNF_NETWORK_DATA` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `svc_request_id` varchar(100) DEFAULT '',
-  `svc_action` varchar(40) DEFAULT '',
-  `status` varchar(10) NOT NULL DEFAULT 'pending',
-  `filename` varchar(100) NOT NULL,
-  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `preload_data` longblob,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=278 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `PSERVER`
---
-
-CREATE TABLE IF NOT EXISTS `PSERVER` (
-  `hostname` varchar(255) NOT NULL,
-  `ptnii_equip_name` varchar(255) DEFAULT '',
-  `number_of_cpus` varchar(255) DEFAULT '',
-  `disk_in_gigabytes` varchar(255) DEFAULT '',
-  `ram_in_megabytes` varchar(255) DEFAULT '',
-  `equip_type` varchar(255) DEFAULT '',
-  `equip_vendor` varchar(255) DEFAULT '',
-  `equip_model` varchar(255) DEFAULT '',
-  `fqdn` varchar(255) DEFAULT '',
-  `pserver_selflink` varchar(255) DEFAULT '',
-  `ipv4_oam_address` varchar(40) DEFAULT NULL,
-  `serial_number` varchar(255) DEFAULT '',
-  `pserver_id` varchar(255) DEFAULT '',
-  `internet_topology` varchar(40) DEFAULT '',
-  `aic_site_id` varchar(100) DEFAULT '',
-  `in_maint` varchar(5) DEFAULT '',
-  `pserver_name2` varchar(255) DEFAULT '',
-  `purpose` varchar(255) DEFAULT '',
-  PRIMARY KEY (`hostname`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `RANGE_RULE`
---
-
-CREATE TABLE IF NOT EXISTS `RANGE_RULE` (
-  `range_rule_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `range_name` varchar(50) NOT NULL,
-  `service_model` varchar(50) NOT NULL,
-  `end_point_position` varchar(50) NOT NULL,
-  `equipment_level` varchar(50) NOT NULL,
-  `min_value` int(11) NOT NULL,
-  `max_value` int(11) NOT NULL,
-  PRIMARY KEY (`range_rule_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `REQUEST_DETAILS`
---
-
-CREATE TABLE IF NOT EXISTS `REQUEST_DETAILS` (
-  `request_id` varchar(255) NOT NULL,
-  `controller_id` varchar(255) DEFAULT NULL,
-  `status` varchar(255) DEFAULT NULL,
-  `service_rate` varchar(255) DEFAULT NULL,
-  `service_instance_id` varchar(255) DEFAULT NULL,
-  `service_type` varchar(255) DEFAULT NULL,
-  `global_customer_id` varchar(255) DEFAULT NULL,
-  `notification_url` varchar(255) DEFAULT NULL,
-  `domain_requests` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`request_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `REQUEST_PROGRESS`
---
-
-CREATE TABLE IF NOT EXISTS `REQUEST_PROGRESS` (
-  `request_id` int(11) NOT NULL AUTO_INCREMENT,
-  `request_type` varchar(20) DEFAULT NULL,
-  `service_instance_id` varchar(80) NOT NULL,
-  `request_instance_type` varchar(20) NOT NULL,
-  `originating_service_instance_id` varchar(80) DEFAULT NULL,
-  `originating_service_type` varchar(20) DEFAULT NULL,
-  `overall_status` varchar(20) DEFAULT NULL,
-  `status_date` varchar(80) DEFAULT NULL,
-  `message` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`request_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `REQUEST_PROGRESS_STATE`
---
-
-CREATE TABLE IF NOT EXISTS `REQUEST_PROGRESS_STATE` (
-  `request_progress_state_id` int(11) NOT NULL AUTO_INCREMENT,
-  `request_id` int(11) DEFAULT NULL,
-  `service_instance_id` varchar(80) NOT NULL,
-  `request_instance_type` varchar(20) NOT NULL,
-  `progress_state` varchar(30) DEFAULT NULL,
-  `transaction_status` varchar(20) DEFAULT NULL,
-  `status_date` varchar(80) DEFAULT NULL,
-  `response_code` varchar(20) DEFAULT NULL,
-  `message` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`request_progress_state_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `RESOURCE`
---
-
-CREATE TABLE IF NOT EXISTS `RESOURCE` (
-  `resource_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `asset_id` varchar(100) NOT NULL,
-  `resource_name` varchar(50) NOT NULL,
-  `resource_type` enum('Limit','Label','Range') NOT NULL,
-  `lt_used` bigint(20) DEFAULT NULL,
-  `ll_label` varchar(50) DEFAULT NULL,
-  `ll_reference_count` smallint(6) DEFAULT NULL,
-  `rr_used` varchar(4000) DEFAULT NULL,
-  PRIMARY KEY (`resource_id`),
-  UNIQUE KEY `resource_id` (`resource_id`),
-  UNIQUE KEY `IX1_RESOURCE` (`asset_id`,`resource_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=179 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `RESOURCE_LOAD`
---
-
-CREATE TABLE IF NOT EXISTS `RESOURCE_LOAD` (
-  `resource_load_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `resource_id` bigint(20) NOT NULL,
-  `application_id` varchar(20) NOT NULL,
-  `resource_load_time` datetime NOT NULL,
-  `resource_expiration_time` datetime DEFAULT NULL,
-  PRIMARY KEY (`resource_load_id`),
-  UNIQUE KEY `resource_load_id` (`resource_load_id`),
-  UNIQUE KEY `IX2_RESOURCE_LOAD` (`resource_id`,`application_id`),
-  KEY `IX1_RESOURCE_LOAD` (`resource_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `RESOURCE_LOCK`
---
-
-CREATE TABLE IF NOT EXISTS `RESOURCE_LOCK` (
-  `resource_lock_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `resource_name` varchar(256) DEFAULT NULL,
-  `lock_holder` varchar(100) NOT NULL,
-  `lock_count` smallint(6) NOT NULL,
-  `lock_time` datetime NOT NULL,
-  `expiration_time` datetime NOT NULL,
-  PRIMARY KEY (`resource_lock_id`),
-  UNIQUE KEY `resource_lock_id` (`resource_lock_id`),
-  UNIQUE KEY `IX1_RESOURCE_LOCK` (`resource_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=29681 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `RESOURCE_RULE`
---
-
-CREATE TABLE IF NOT EXISTS `RESOURCE_RULE` (
-  `resource_rule_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `resource_name` varchar(50) NOT NULL,
-  `service_model` varchar(50) NOT NULL,
-  `end_point_position` varchar(50) NOT NULL,
-  `service_expression` varchar(2000) NOT NULL,
-  `equipment_level` varchar(50) NOT NULL,
-  `equipment_expression` varchar(2000) NOT NULL,
-  `allocation_expression` varchar(2000) NOT NULL,
-  `soft_limit_expression` varchar(2000) NOT NULL,
-  `hard_limit_expression` varchar(2000) NOT NULL,
-  PRIMARY KEY (`resource_rule_id`),
-  UNIQUE KEY `resource_rule_id` (`resource_rule_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `RESOURCE_THRESHOLD`
---
-
-CREATE TABLE IF NOT EXISTS `RESOURCE_THRESHOLD` (
-  `resource_threshold_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `resource_rule_id` bigint(20) NOT NULL,
-  `threshold_expression` varchar(2000) NOT NULL,
-  `threshold_message` varchar(2000) NOT NULL,
-  PRIMARY KEY (`resource_threshold_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `ROUTER_MASTER`
---
-
-CREATE TABLE IF NOT EXISTS `ROUTER_MASTER` (
-  `crs_name` varchar(20) NOT NULL,
-  `loopback_ip` varchar(20) NOT NULL,
-  PRIMARY KEY (`crs_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `ROUTING_CHARACTERISTIC_MAPPING`
---
-
-CREATE TABLE IF NOT EXISTS `ROUTING_CHARACTERISTIC_MAPPING` (
-  `network_role` varchar(255) NOT NULL,
-  `vrf_name` varchar(255) NOT NULL,
-  `routing_characteristic` varchar(255) NOT NULL,
-  PRIMARY KEY (`network_role`,`vrf_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `SERVICE_HOMING`
---
-
-CREATE TABLE IF NOT EXISTS `SERVICE_HOMING` (
-  `service_type` varchar(100) NOT NULL,
-  `lata` int(3) NOT NULL,
-  `hubbing_city_type` varchar(40) NOT NULL,
-  `latitude` float DEFAULT NULL,
-  `longitude` float DEFAULT NULL,
-  `primary_aic_site_name` varchar(100) NOT NULL,
-  `secondary_aic_site_name` varchar(100) DEFAULT NULL,
-  `tertiary_aic_site_name` varchar(100) DEFAULT NULL,
-  PRIMARY KEY (`service_type`,`lata`,`hubbing_city_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `SERVICE_HOMING_BACKUP`
---
-
-CREATE TABLE IF NOT EXISTS `SERVICE_HOMING_BACKUP` (
-  `service_type` varchar(100) NOT NULL,
-  `lata` int(3) NOT NULL,
-  `hubbing_city_type` varchar(40) NOT NULL,
-  `latitude` float DEFAULT NULL,
-  `longitude` float DEFAULT NULL,
-  `primary_aic_site_name` varchar(100) NOT NULL,
-  `secondary_aic_site_name` varchar(100) DEFAULT NULL,
-  `tertiary_aic_site_name` varchar(100) DEFAULT NULL,
-  PRIMARY KEY (`service_type`,`lata`,`hubbing_city_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `SERVICE_INSTANCE_NAME_INDEX`
---
-
-CREATE TABLE IF NOT EXISTS `SERVICE_INSTANCE_NAME_INDEX` (
-  `service_instance_name_prefix` varchar(255) NOT NULL,
-  `index_number` int(11) NOT NULL,
-  PRIMARY KEY (`service_instance_name_prefix`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `SERVICE_MANAGER_CREDENTIALS`
---
-
-CREATE TABLE IF NOT EXISTS `SERVICE_MANAGER_CREDENTIALS` (
-  `service_manager_username` varchar(255) NOT NULL,
-  `service_manager_password` varbinary(255) NOT NULL,
-  PRIMARY KEY (`service_manager_username`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `SERVICE_PROXY`
---
-
-CREATE TABLE IF NOT EXISTS `SERVICE_PROXY` (
-  `port_mirror_service_uuid` varchar(255) NOT NULL,
-  `service_proxy_name` varchar(255) NOT NULL,
-  `source_service_uuid` varchar(255) NOT NULL,
-  `resources_vendor` varchar(255) DEFAULT NULL,
-  `resource_vendor_release` varchar(255) DEFAULT NULL,
-  `description` varchar(255) DEFAULT NULL,
-  `category` varchar(255) DEFAULT NULL,
-  `subcategory` varchar(255) DEFAULT NULL,
-  `version` varchar(255) DEFAULT NULL,
-  `role` varchar(255) NOT NULL,
-  `uuid` varchar(255) DEFAULT NULL,
-  `customization_uuid` varchar(255) DEFAULT NULL,
-  `invariant_uuid` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`port_mirror_service_uuid`,`service_proxy_name`),
-  KEY `FK_SERVICE_PROXY_SOURCE_TO_SERVICE_MODE` (`source_service_uuid`),
-  CONSTRAINT `FK_SERVICE_PROXY_MIRROR_TO_SERVICE_MODE` FOREIGN KEY (`port_mirror_service_uuid`) REFERENCES `SERVICE_MODEL` (`service_uuid`) ON DELETE CASCADE ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `SERVICE_RESOURCE`
---
-
-CREATE TABLE IF NOT EXISTS `SERVICE_RESOURCE` (
-  `service_resource_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `service_instance_id` varchar(80) NOT NULL,
-  `service_status` enum('Active','Pending') NOT NULL,
-  `service_change_number` smallint(6) NOT NULL,
-  `resource_set_id` varchar(100) NOT NULL,
-  `resource_union_id` varchar(100) NOT NULL,
-  PRIMARY KEY (`service_instance_id`,`service_change_number`),
-  UNIQUE KEY `service_resource_id` (`service_resource_id`),
-  KEY `IX1_SERVICE_RESOURCE` (`service_instance_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=955 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `SERVICE_TYPE_MAPPING`
---
-
-CREATE TABLE IF NOT EXISTS `SERVICE_TYPE_MAPPING` (
-  `sdnc_service_type` varchar(128) NOT NULL,
-  `ncs_service_type` varchar(128) NOT NULL,
-  PRIMARY KEY (`sdnc_service_type`,`ncs_service_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `SUBNETPOOL_MAPPING`
---
-
-CREATE TABLE IF NOT EXISTS `SUBNETPOOL_MAPPING` (
-  `aic_cloud_region` varchar(16) NOT NULL,
-  `ntc` varchar(32) NOT NULL,
-  `lcp` varchar(32) NOT NULL,
-  `aic_region_id` varchar(255) NOT NULL,
-  PRIMARY KEY (`aic_cloud_region`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `SUPPORTED_SEQUENCE_NUMBER`
---
-
-CREATE TABLE IF NOT EXISTS `SUPPORTED_SEQUENCE_NUMBER` (
-  `resource_sequence_number` varchar(10) NOT NULL,
-  `resource_type` varchar(10) NOT NULL,
-  PRIMARY KEY (`resource_sequence_number`,`resource_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `SVC_LOGIC`
---
-
-CREATE TABLE IF NOT EXISTS `SVC_LOGIC` (
-  `module` varchar(80) NOT NULL,
-  `rpc` varchar(80) NOT NULL,
-  `version` varchar(40) NOT NULL,
-  `mode` varchar(5) NOT NULL,
-  `active` varchar(1) NOT NULL,
-  `graph` longblob,
-  `modified_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `md5sum` varchar(128) DEFAULT NULL,
-  PRIMARY KEY (`module`,`rpc`,`version`,`mode`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `TABLE_CLEANUP_CONFIGURATION`
---
-
-CREATE TABLE IF NOT EXISTS `TABLE_CLEANUP_CONFIGURATION` (
-  `table_name` varchar(255) NOT NULL COMMENT 'The name of the table the cleanup will be performed on',
-  `days_old` int(11) NOT NULL COMMENT 'Records older than the current date minus DAYS_OLD will be deleted',
-  `date_column` varchar(255) NOT NULL COMMENT 'The name of the column containing the date to be checked',
-  `commit_interval` int(11) NOT NULL DEFAULT '2500' COMMENT 'The maximum number of rows a commit may contain',
-  `query_clause` varchar(1000) DEFAULT NULL COMMENT 'An optional additional query clause to further restrict deletion criteria',
-  `child_table_name` varchar(255) DEFAULT NULL,
-  `child_table_pk` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='This table will be used by the table clean-up script, tableCleanup.sh, to drive what tables should be purged and what the purge criteria are.';
-
---
--- Table structure for table `TASK_TEMPLATE`
---
-
-CREATE TABLE IF NOT EXISTS `TASK_TEMPLATE` (
-  `task_template_id` int(11) NOT NULL AUTO_INCREMENT,
-  `request_type` varchar(20) DEFAULT NULL,
-  `task_name` varchar(30) NOT NULL,
-  `task_category` varchar(50) NOT NULL,
-  `ecomp_task` varchar(50) NOT NULL,
-  `initial_load` varchar(1) NOT NULL,
-  `service` varchar(20) DEFAULT NULL,
-  PRIMARY KEY (`task_template_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `TENANT`
---
-
-CREATE TABLE IF NOT EXISTS `TENANT` (
-  `tenant_id` varchar(255) NOT NULL,
-  `tenant_name` varchar(255) NOT NULL,
-  `service_instance_id` varchar(255) NOT NULL,
-  PRIMARY KEY (`tenant_id`,`tenant_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `TESTTBL`
---
-
-CREATE TABLE IF NOT EXISTS `TESTTBL` (
-  `pk` varchar(25) NOT NULL,
-  `col1` varchar(25) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `THRESHOLD_NOTIFICATION`
---
-
-CREATE TABLE IF NOT EXISTS `THRESHOLD_NOTIFICATION` (
-  `resource_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `threshold_expression` varchar(2000) DEFAULT NULL,
-  `threshold_message` varchar(500) DEFAULT NULL,
-  PRIMARY KEY (`resource_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `TMP_AIC_AVAIL_ZONE_POOL`
---
-
-CREATE TABLE IF NOT EXISTS `TMP_AIC_AVAIL_ZONE_POOL` (
-  `aic_site_id` varchar(100) NOT NULL,
-  `status` varchar(40) NOT NULL,
-  `availability_zone` varchar(100) NOT NULL,
-  `token` int(4) NOT NULL,
-  `vnf_id` varchar(80) DEFAULT NULL,
-  `service_type` varchar(100) NOT NULL,
-  `vnf_type` varchar(20) DEFAULT NULL,
-  `hypervisor` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`aic_site_id`,`availability_zone`,`token`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `TOPOLOGY_PARAMETER`
---
-
-CREATE TABLE IF NOT EXISTS `TOPOLOGY_PARAMETER` (
-  `parameter_id` int(11) NOT NULL,
-  `parameter_name` varchar(20) NOT NULL,
-  `parameter_set` int(11) NOT NULL,
-  `create_update_time` datetime NOT NULL,
-  `create_update_user` varchar(40) NOT NULL,
-  PRIMARY KEY (`parameter_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `TOPOLOGY_PARAMETER_ENTRIES`
---
-
-CREATE TABLE IF NOT EXISTS `TOPOLOGY_PARAMETER_ENTRIES` (
-  `parameter_entry_id` int(11) NOT NULL,
-  `parameter_name` varchar(255) NOT NULL,
-  `parameter_value` varchar(64) NOT NULL,
-  `create_update_time` datetime NOT NULL,
-  `create_update_user` varchar(40) NOT NULL,
-  PRIMARY KEY (`parameter_entry_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `TOPOLOGY_PARAMETER_TO_ENTRIES`
---
-
-CREATE TABLE IF NOT EXISTS `TOPOLOGY_PARAMETER_TO_ENTRIES` (
-  `parameter_id` int(11) DEFAULT NULL,
-  `parameter_entry_id` int(11) DEFAULT NULL,
-  `entry_order` int(11) DEFAULT NULL,
-  `create_update_time` datetime DEFAULT NULL,
-  `create_update_user` varchar(40) NOT NULL,
-  KEY `FK1_TOPOLOGY_PARAMETER_TO_ENTRIES` (`parameter_id`),
-  KEY `FK2_TOPOLOGY_PARAMETER_TO_ENTRIES` (`parameter_entry_id`),
-  CONSTRAINT `FK1_TOPOLOGY_PARAMETER_TO_ENTRIES` FOREIGN KEY (`parameter_id`) REFERENCES `TOPOLOGY_PARAMETER` (`parameter_id`),
-  CONSTRAINT `FK2_TOPOLOGY_PARAMETER_TO_ENTRIES` FOREIGN KEY (`parameter_entry_id`) REFERENCES `TOPOLOGY_PARAMETER_ENTRIES` (`parameter_entry_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE`
---
-
-CREATE TABLE IF NOT EXISTS `TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE` (
-  `interface_name` varchar(255) NOT NULL,
-  `interface_id` varchar(255) NOT NULL,
-  `pnf_name` varchar(255) NOT NULL,
-  `pnf_id` varchar(255) NOT NULL,
-  `controller_id` varchar(255) DEFAULT NULL,
-  `rate` varchar(255) DEFAULT NULL,
-  `clli` varchar(255) DEFAULT NULL,
-  `connection_point` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`interface_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `TRANSACTION_LOG`
---
-
-CREATE TABLE IF NOT EXISTS `TRANSACTION_LOG` (
-  `serial_key` int(10) NOT NULL AUTO_INCREMENT,
-  `log_time` varchar(40) NOT NULL,
-  `request_id` varchar(80) DEFAULT NULL,
-  `svc_request_id` varchar(80) DEFAULT NULL,
-  `x_ecomp_request_id` varchar(80) DEFAULT NULL,
-  `graph_name` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`serial_key`)
-) ENGINE=InnoDB AUTO_INCREMENT=249 DEFAULT CHARSET=latin1;
-
-
---
--- Table structure for table `UPLOAD_CONFIG`
---
-
-CREATE TABLE IF NOT EXISTS `UPLOAD_CONFIG` (
-  `upload_config_id` int(11) NOT NULL AUTO_INCREMENT,
-  `request_id` varchar(50) DEFAULT NULL,
-  `originator_id` varchar(50) DEFAULT NULL,
-  `service_description` varchar(100) DEFAULT NULL,
-  `action` varchar(50) DEFAULT NULL,
-  `upload_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `vnf_id` varchar(50) DEFAULT NULL,
-  `vnf_name` varchar(50) DEFAULT NULL,
-  `vm_name` varchar(50) DEFAULT NULL,
-  `vnf_type` varchar(50) DEFAULT NULL,
-  `vnfc_type` varchar(50) DEFAULT NULL,
-  `host_ip_address` varchar(50) DEFAULT NULL,
-  `config_indicator` varchar(25) DEFAULT NULL,
-  `pending_delete` varchar(1) DEFAULT NULL,
-  `content` longtext,
-  PRIMARY KEY (`upload_config_id`),
-  UNIQUE KEY `upload_config_id` (`upload_config_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `USED_SEQUENCE_NUMBER`
---
-
-CREATE TABLE IF NOT EXISTS `USED_SEQUENCE_NUMBER` (
-  `resource_sequence_number` varchar(10) NOT NULL,
-  `resource_type` varchar(10) NOT NULL,
-  `zone_region_id` varchar(50) NOT NULL,
-  PRIMARY KEY (`resource_sequence_number`,`resource_type`,`zone_region_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `USER_TRACE`
---
-
-CREATE TABLE IF NOT EXISTS `USER_TRACE` (
-  `user_trace_seq` int(11) NOT NULL AUTO_INCREMENT,
-  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `identity` varchar(12) DEFAULT NULL,
-  `action` varchar(128) DEFAULT NULL,
-  `description` varchar(256) DEFAULT NULL,
-  PRIMARY KEY (`user_trace_seq`)
-) ENGINE=InnoDB AUTO_INCREMENT=392 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VENDOR_CODE`
---
-
-CREATE TABLE IF NOT EXISTS `VENDOR_CODE` (
-  `vendor_code` varchar(1) NOT NULL,
-  `vendor` varchar(45) NOT NULL DEFAULT '',
-  PRIMARY KEY (`vendor_code`,`vendor`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VFC_MODEL`
---
-
-CREATE TABLE IF NOT EXISTS `VFC_MODEL` (
-  `customization_uuid` varchar(255) NOT NULL,
-  `model_yaml` longblob,
-  `invariant_uuid` varchar(255) DEFAULT NULL,
-  `uuid` varchar(255) DEFAULT NULL,
-  `version` varchar(255) DEFAULT NULL,
-  `naming_policy` varchar(255) DEFAULT NULL,
-  `ecomp_generated_naming` char(1) DEFAULT NULL,
-  `nfc_function` varchar(255) DEFAULT NULL,
-  `nfc_naming_code` varchar(255) DEFAULT NULL,
-  `vm_type` varchar(255) DEFAULT NULL,
-  `vm_type_tag` varchar(255) DEFAULT NULL,
-  `vm_image_name` varchar(255) DEFAULT NULL,
-  `vm_flavor_name` varchar(255) DEFAULT NULL,
-  `high_availability` varchar(255) DEFAULT NULL,
-  `nfc_naming` varchar(255) DEFAULT NULL,
-  `min_instances` int(11) DEFAULT NULL,
-  `max_instances` int(11) DEFAULT NULL,
-  PRIMARY KEY (`customization_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VFC_TO_NETWORK_ROLE_MAPPING`
---
-
-
-CREATE TABLE IF NOT EXISTS `VFC_TO_NETWORK_ROLE_MAPPING` (
-  `seq` int(11) NOT NULL AUTO_INCREMENT,
-  `vfc_customization_uuid` varchar(255) NOT NULL,
-  `network_role` varchar(255) NOT NULL,
-  `vm_type` varchar(255) DEFAULT NULL,
-  `network_role_tag` varchar(255) DEFAULT NULL,
-  `ipv4_count` int(11) NOT NULL,
-  `ipv6_count` int(11) NOT NULL,
-  `ipv4_use_dhcp` char(1) DEFAULT NULL,
-  `ipv6_use_dhcp` char(1) DEFAULT NULL,
-  `ipv4_ip_version` char(1) DEFAULT NULL,
-  `ipv6_ip_version` char(1) DEFAULT NULL,
-  `extcp_subnetpool_id` varchar(512) DEFAULT NULL,
-  `ipv4_floating_count` int(11) DEFAULT NULL,
-  `ipv6_floating_count` int(11) DEFAULT NULL,
-  `ipv4_address_plan_name` varchar(512) DEFAULT NULL,
-  `ipv6_address_plan_name` varchar(512) DEFAULT NULL,
-  `ipv4_vrf_name` varchar(512) DEFAULT NULL,
-  `ipv6_vrf_name` varchar(512) DEFAULT NULL,
-  `subnet_role` varchar(255) DEFAULT NULL,
-  `subinterface_indicator` char(1) DEFAULT NULL,
-  PRIMARY KEY (`seq`),
-  KEY `IX1_VFC_TO_NETWORK_ROLE_MAPPING` (`vfc_customization_uuid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2063 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VF_MODEL`
---
-
-CREATE TABLE IF NOT EXISTS `VF_MODEL` (
-  `customization_uuid` varchar(255) NOT NULL,
-  `model_yaml` longblob,
-  `invariant_uuid` varchar(255) DEFAULT NULL,
-  `uuid` varchar(255) DEFAULT NULL,
-  `version` varchar(255) DEFAULT NULL,
-  `name` varchar(255) DEFAULT NULL,
-  `naming_policy` varchar(255) DEFAULT NULL,
-  `ecomp_generated_naming` char(1) DEFAULT NULL,
-  `avail_zone_max_count` int(11) DEFAULT NULL,
-  `nf_function` varchar(255) DEFAULT NULL,
-  `nf_code` varchar(255) DEFAULT NULL,
-  `nf_type` varchar(255) DEFAULT NULL,
-  `nf_role` varchar(255) DEFAULT NULL,
-  `vendor` varchar(255) DEFAULT NULL,
-  `vendor_version` varchar(255) DEFAULT NULL,
-  `sdnc_model_name` varchar(255) DEFAULT NULL,
-  `sdnc_model_version` varchar(255) DEFAULT NULL,
-  `sdnc_artifact_name` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`customization_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VF_MODULE_MODEL`
---
-
-CREATE TABLE IF NOT EXISTS `VF_MODULE_MODEL` (
-  `customization_uuid` varchar(255) NOT NULL,
-  `model_yaml` longblob,
-  `invariant_uuid` varchar(255) DEFAULT NULL,
-  `uuid` varchar(255) DEFAULT NULL,
-  `version` varchar(255) DEFAULT NULL,
-  `vf_module_type` varchar(255) DEFAULT NULL,
-  `availability_zone_count` int(11) DEFAULT NULL,
-  `ecomp_generated_vm_assignments` char(1) DEFAULT NULL,
-  `vf_customization_uuid` varchar(255) DEFAULT NULL,
-  `vf_module_label` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`customization_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VF_MODULE_TO_VFC_MAPPING`
---
-
-CREATE TABLE IF NOT EXISTS `VF_MODULE_TO_VFC_MAPPING` (
-  `seq` int(11) NOT NULL AUTO_INCREMENT,
-  `vf_module_customization_uuid` varchar(255) NOT NULL,
-  `vfc_customization_uuid` varchar(255) NOT NULL,
-  `vm_type` varchar(255) NOT NULL,
-  `vm_count` int(11) NOT NULL,
-  PRIMARY KEY (`seq`),
-  KEY `IX1_VF_MODULE_TO_VFC_MAPPING` (`vf_module_customization_uuid`)
-) ENGINE=InnoDB AUTO_INCREMENT=1711 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VF_TO_NETWORK_ROLE_MAPPING`
---
-
-CREATE TABLE IF NOT EXISTS `VF_TO_NETWORK_ROLE_MAPPING` (
-  `seq` int(11) NOT NULL AUTO_INCREMENT,
-  `vf_customization_uuid` varchar(255) NOT NULL,
-  `network_role` varchar(255) NOT NULL,
-  PRIMARY KEY (`seq`),
-  KEY `IX1_VF_TO_NETWORK_ROLE_MAPPING` (`vf_customization_uuid`)
-) ENGINE=InnoDB AUTO_INCREMENT=348 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VIPR_CONFIGURATION`
---
-
-CREATE TABLE IF NOT EXISTS `VIPR_CONFIGURATION` (
-  `seq` int(11) NOT NULL AUTO_INCREMENT,
-  `serial_number` varchar(255) DEFAULT NULL,
-  `vnf_id` varchar(255) DEFAULT NULL,
-  `vnf_name` varchar(255) DEFAULT NULL,
-  `ecomp_service_instance_id` varchar(255) DEFAULT NULL,
-  `vm_name` varchar(255) DEFAULT NULL,
-  `cloud_region_id` varchar(255) DEFAULT NULL,
-  `cloud_owner` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`seq`)
-) ENGINE=InnoDB AUTO_INCREMENT=50 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VIPR_SZ_MANAGER_KEY`
---
-
-CREATE TABLE IF NOT EXISTS `VIPR_SZ_MANAGER_KEY` (
-  `vipr_sz_manager_ip_addr` varchar(40) NOT NULL,
-  `vipr_sz_manager_state` varchar(10) DEFAULT NULL,
-  `vipr_sz_manager_api_key` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`vipr_sz_manager_ip_addr`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VLAN_ID_POOL`
---
-
-CREATE TABLE IF NOT EXISTS `VLAN_ID_POOL` (
-  `aic_site_id` varchar(100) NOT NULL,
-  `purpose` varchar(40) NOT NULL,
-  `status` varchar(40) NOT NULL,
-  `vlan_id` int(4) NOT NULL,
-  `svc_instance_id` varchar(80) DEFAULT NULL,
-  `availability_zone` varchar(100) DEFAULT NULL,
-  `vplspe_name` varchar(80) DEFAULT NULL,
-  PRIMARY KEY (`vlan_id`,`aic_site_id`,`purpose`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VLAN_L3INTERFACE_IPV4_ADDRESS`
---
-
-CREATE TABLE IF NOT EXISTS `VLAN_L3INTERFACE_IPV4_ADDRESS` (
-  `vnf_id` varchar(80) NOT NULL,
-  `interface_name` varchar(255) NOT NULL,
-  `vlan_interface` varchar(255) NOT NULL,
-  `l3_interface_ipv4_address` varchar(64) NOT NULL,
-  `l3_interface_ipv4_prefix_length` varchar(45) DEFAULT NULL,
-  `vlan_id_inner` varchar(45) DEFAULT NULL,
-  `vlan_id_outer` varchar(45) DEFAULT NULL,
-  `is_floating` varchar(1) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`,`interface_name`,`vlan_interface`,`l3_interface_ipv4_address`),
-  KEY `FK_VLAN_L3INTERFACE_IPV4_ADDRESS_LINTERFACE_VLAN_IDX` (`vnf_id`,`interface_name`),
-  CONSTRAINT `FK_VLAN_L3INTERFACE_IPV4_ADDRESS_LINTERFACE_VLAN` FOREIGN KEY (`vnf_id`, `interface_name`, `vlan_interface`) REFERENCES `LINTERFACE_VLAN` (`vnf_id`, `interface_name`, `vlan_interface`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VLAN_L3INTERFACE_IPV6_ADDRESS`
---
-
-CREATE TABLE IF NOT EXISTS `VLAN_L3INTERFACE_IPV6_ADDRESS` (
-  `vnf_id` varchar(80) NOT NULL,
-  `interface_name` varchar(255) NOT NULL,
-  `vlan_interface` varchar(255) NOT NULL,
-  `l3_interface_ipv6_address` varchar(64) NOT NULL,
-  `l3_interface_ipv6_prefix_length` varchar(45) DEFAULT NULL,
-  `vlan_id_inner` varchar(45) DEFAULT NULL,
-  `vlan_id_outer` varchar(45) DEFAULT NULL,
-  `is_floating` varchar(1) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`,`interface_name`,`vlan_interface`,`l3_interface_ipv6_address`),
-  KEY `FK_VLAN_L3INTERFACE_IPV6_ADDRESS_LINTERFACE_VLAN_IDX` (`vnf_id`,`interface_name`,`vlan_interface`),
-  CONSTRAINT `FK_VLAN_L3INTERFACE_IPV6_ADDRESS_LINTERFACE_VLAN` FOREIGN KEY (`vnf_id`, `interface_name`, `vlan_interface`) REFERENCES `LINTERFACE_VLAN` (`vnf_id`, `interface_name`, `vlan_interface`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VLAN_PLAN_ID`
---
-
-CREATE TABLE IF NOT EXISTS `VLAN_PLAN_ID` (
-  `plan_type` varchar(40) NOT NULL,
-  `purpose` varchar(40) NOT NULL,
-  `vlan_plan_id_count` int(4) NOT NULL,
-  PRIMARY KEY (`vlan_plan_id_count`,`plan_type`,`purpose`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VLAN_POOL`
---
-
-CREATE TABLE IF NOT EXISTS `VLAN_POOL` (
-  `aic_site_id` varchar(100) NOT NULL,
-  `availability_zone` varchar(100) NOT NULL,
-  `vlan_plan_id` varchar(100) NOT NULL,
-  `plan_type` varchar(40) NOT NULL,
-  `purpose` varchar(40) NOT NULL,
-  `vlan_id` int(4) NOT NULL,
-  `status` varchar(40) NOT NULL,
-  `reserved_id` varchar(80) DEFAULT NULL,
-  PRIMARY KEY (`aic_site_id`,`availability_zone`,`vlan_plan_id`,`plan_type`,`purpose`,`vlan_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VLAN_RANGES`
---
-
-CREATE TABLE IF NOT EXISTS `VLAN_RANGES` (
-  `vlan_plan_id` varchar(100) NOT NULL,
-  `plan_type` varchar(40) NOT NULL,
-  `purpose` varchar(40) NOT NULL,
-  `range_start` int(4) NOT NULL,
-  `range_end` int(4) NOT NULL,
-  `generated` char(1) DEFAULT NULL,
-  PRIMARY KEY (`vlan_plan_id`,`plan_type`,`purpose`,`range_start`,`range_end`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VM_NAME_INDEX`
---
-
-CREATE TABLE IF NOT EXISTS `VM_NAME_INDEX` (
-  `vm_name_prefix` varchar(255) NOT NULL,
-  `index_number` int(11) NOT NULL,
-  PRIMARY KEY (`vm_name_prefix`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VM_NETWORKS`
---
-
-CREATE TABLE IF NOT EXISTS `VM_NETWORKS` (
-  `vnf_type` varchar(200) NOT NULL,
-  `vm_type` varchar(45) NOT NULL,
-  `network_role` varchar(45) NOT NULL,
-  `assign_ips` tinyint(1) NOT NULL,
-  `assign_macs` tinyint(1) NOT NULL,
-  `assign_floating_ip` tinyint(1) NOT NULL,
-  `ip_count` int(11) DEFAULT NULL,
-  PRIMARY KEY (`vnf_type`,`vm_type`,`network_role`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VM_PROFILE`
---
-
-CREATE TABLE IF NOT EXISTS `VM_PROFILE` (
-  `vnf_type` varchar(200) NOT NULL,
-  `vm_type` varchar(45) NOT NULL,
-  `vm_count` int(11) NOT NULL,
-  PRIMARY KEY (`vnf_type`,`vm_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VNF`
---
-
-CREATE TABLE IF NOT EXISTS `VNF` (
-  `vnf_id` varchar(80) NOT NULL,
-  `vnf_name` varchar(80) NOT NULL,
-  `vnf_type` varchar(10) NOT NULL,
-  `orchestration_status` varchar(20) DEFAULT NULL,
-  `heat_stack_id` varchar(80) DEFAULT NULL,
-  `mso_catalog_key` varchar(80) DEFAULT NULL,
-  `availability_zone` varchar(80) DEFAULT NULL,
-  `aic_site_id` varchar(80) DEFAULT NULL,
-  `oam_ipv4_address` varchar(20) DEFAULT NULL,
-  `vnf_name2` varchar(80) DEFAULT NULL,
-  `vpe_id` varchar(80) NOT NULL,
-  `ipv4_loopback0_address` varchar(80) DEFAULT NULL,
-  `license_key` varchar(256) DEFAULT NULL,
-  `entitlement_resource_uuid` varchar(256) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VNFC_DG_MAPPING`
---
-
-CREATE TABLE IF NOT EXISTS `VNFC_DG_MAPPING` (
-  `vnfc_dg_mapping_id` int(11) NOT NULL AUTO_INCREMENT,
-  `action` varchar(50) DEFAULT NULL,
-  `api_version` varchar(10) DEFAULT NULL,
-  `vnf_type` varchar(50) DEFAULT NULL,
-  `vnfc_type` varchar(50) DEFAULT NULL,
-  `dg_name` varchar(50) NOT NULL,
-  `dg_version` varchar(50) DEFAULT NULL,
-  `dg_module` varchar(50) NOT NULL,
-  PRIMARY KEY (`vnfc_dg_mapping_id`),
-  UNIQUE KEY `input_constraint` (`action`,`api_version`,`vnf_type`,`vnfc_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VNFC_REFERENCE`
---
-
-CREATE TABLE IF NOT EXISTS `VNFC_REFERENCE` (
-  `vnfc_reference_id` int(11) NOT NULL AUTO_INCREMENT,
-  `action` varchar(50) NOT NULL,
-  `vnf_type` varchar(50) NOT NULL,
-  `vm_instance` int(11) NOT NULL,
-  `vnfc_instance` int(11) NOT NULL,
-  `vnfc_type` varchar(50) NOT NULL,
-  `vnfc_function_code` varchar(50) NOT NULL,
-  `ipaddress_v4_oam_vip` varchar(50) DEFAULT NULL,
-  `group_notation_type` varchar(50) DEFAULT NULL,
-  `group_notation_value` varchar(50) DEFAULT NULL,
-  PRIMARY KEY (`vnfc_reference_id`),
-  UNIQUE KEY `vnfc_reference_id` (`vnfc_reference_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VNF_IMAGE`
---
-
-CREATE TABLE IF NOT EXISTS `VNF_IMAGE` (
-  `application_vendor` varchar(255) NOT NULL,
-  `application_version` varchar(255) NOT NULL,
-  `att_uuid` varchar(255) NOT NULL,
-  `application` varchar(255) DEFAULT NULL,
-  `selflink` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`application_vendor`,`application_version`,`att_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VNF_MODEL_LICENSES`
---
-
-CREATE TABLE IF NOT EXISTS `VNF_MODEL_LICENSES` (
-  `att_part_number` varchar(255) NOT NULL,
-  `license_assignment_group` varchar(255) NOT NULL,
-  `license_required` tinyint(1) DEFAULT NULL,
-  `entitlement_assignment_group` varchar(255) DEFAULT NULL,
-  `entitlement_required` tinyint(1) DEFAULT '0',
-  `feature_group_uuid` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`att_part_number`,`license_assignment_group`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VNF_MODEL_LICENSE_FEATURES`
---
-
-CREATE TABLE IF NOT EXISTS `VNF_MODEL_LICENSE_FEATURES` (
-  `att_part_number` varchar(255) NOT NULL,
-  `license_assignment_group` varchar(255) NOT NULL,
-  `feature` varchar(255) NOT NULL,
-  PRIMARY KEY (`att_part_number`,`license_assignment_group`,`feature`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VNF_NAME_INDEX`
---
-
-CREATE TABLE IF NOT EXISTS `VNF_NAME_INDEX` (
-  `vnf_name_prefix` varchar(255) NOT NULL,
-  `index_number` int(11) NOT NULL,
-  PRIMARY KEY (`vnf_name_prefix`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VNF_NETWORKS`
---
-
-CREATE TABLE IF NOT EXISTS `VNF_NETWORKS` (
-  `vnf_type` varchar(200) NOT NULL,
-  `network_role` varchar(45) NOT NULL,
-  PRIMARY KEY (`vnf_type`,`network_role`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VNF_NETWORK_CONNECTION`
---
-
-CREATE TABLE IF NOT EXISTS `VNF_NETWORK_CONNECTION` (
-  `connection_uuid` varchar(80) NOT NULL,
-  `vnf_id` varchar(80) NOT NULL,
-  `connection_id` varchar(80) DEFAULT NULL,
-  `connection_type` varchar(20) DEFAULT NULL,
-  `neutron_network_id` varchar(80) DEFAULT NULL,
-  `neutron_network_name` varchar(80) DEFAULT NULL,
-  `orchestration_status` varchar(20) DEFAULT NULL,
-  `switch_id` varchar(40) DEFAULT NULL,
-  `heat_stack_id` varchar(80) DEFAULT NULL,
-  `mso_catalog_key` varchar(80) DEFAULT NULL,
-  `provider_network` varchar(80) DEFAULT NULL,
-  `port_group_id` varchar(80) DEFAULT NULL,
-  `port_group_name` varchar(80) DEFAULT NULL,
-  PRIMARY KEY (`connection_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VNF_NETWORK_CONNECTION_VLAN`
---
-
-CREATE TABLE IF NOT EXISTS `VNF_NETWORK_CONNECTION_VLAN` (
-  `vlan_uuid` varchar(80) NOT NULL,
-  `vlan_id` int(4) NOT NULL,
-  `vlan_type` varchar(5) NOT NULL,
-  `connection_uuid` varchar(80) DEFAULT NULL,
-  PRIMARY KEY (`vlan_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VNF_PROFILE`
---
-
-CREATE TABLE IF NOT EXISTS `VNF_PROFILE` (
-  `vnf_type` varchar(200) NOT NULL,
-  `availability_zone_count` int(11) NOT NULL,
-  `equipment_role` varchar(80) NOT NULL,
-  PRIMARY KEY (`vnf_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VNF_SERVICE_TO_NETWORK_ROLE_FILTER`
---
-
-CREATE TABLE IF NOT EXISTS `VNF_SERVICE_TO_NETWORK_ROLE_FILTER` (
-  `vnf_service_type` varchar(60) NOT NULL,
-  `network_role_filter` varchar(60) NOT NULL,
-  PRIMARY KEY (`vnf_service_type`,`network_role_filter`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VPE_LOCK`
---
-
-CREATE TABLE IF NOT EXISTS `VPE_LOCK` (
-  `vpe_name` varchar(20) NOT NULL,
-  `vpn_lock` varchar(20) NOT NULL,
-  PRIMARY KEY (`vpe_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VPE_MAC_ADDRESS_POOL`
---
-
-CREATE TABLE IF NOT EXISTS `VPE_MAC_ADDRESS_POOL` (
-  `id` int(11) NOT NULL,
-  `mac_address` varchar(50) NOT NULL,
-  `sw_name` varchar(30) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING`
---
-
-CREATE TABLE IF NOT EXISTS `VPE_MAC_ADDRESS_TO_HOSTNAME_MAPPING` (
-  `id` int(11) NOT NULL,
-  `hostname` varchar(50) NOT NULL,
-  `assigned_user` varchar(25) NOT NULL,
-  `assigned_date` date DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VPE_POOL`
---
-
-CREATE TABLE IF NOT EXISTS `VPE_POOL` (
-  `vpe_name` varchar(20) NOT NULL,
-  `ipv4_oam_address` varchar(20) NOT NULL,
-  `loopback0_ipv4_address` varchar(20) NOT NULL,
-  `provisioning_status` varchar(10) NOT NULL,
-  `aic_site_id` varchar(100) NOT NULL,
-  `availability_zone` varchar(100) NOT NULL,
-  `vlan_id_outer` varchar(20) NOT NULL,
-  `vendor` varchar(20) NOT NULL,
-  `physical_intf_name` varchar(40) NOT NULL,
-  `physical_intf_speed` varchar(20) NOT NULL,
-  `physical_intf_units` varchar(20) NOT NULL,
-  `vpe_uuid` varchar(80) DEFAULT NULL,
-  `vpe_id` varchar(80) NOT NULL,
-  `image_filename` varchar(100) DEFAULT NULL,
-  `as_number` varchar(20) NOT NULL,
-  `loopback5000` varchar(16) DEFAULT NULL,
-  `loopback10` varchar(16) DEFAULT NULL,
-  `aic_version` varchar(50) DEFAULT NULL,
-  `vpe_capacity` int(11) NOT NULL,
-  PRIMARY KEY (`aic_site_id`,`vpe_name`,`availability_zone`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VPLSPE_POOL`
---
-
-CREATE TABLE IF NOT EXISTS `VPLSPE_POOL` (
-  `vplspe_name` varchar(20) NOT NULL,
-  `aic_site_id` varchar(100) NOT NULL,
-  `availability_zone` varchar(100) NOT NULL,
-  `physical_intf_name` varchar(40) NOT NULL,
-  `physical_intf_speed` varchar(20) NOT NULL,
-  `physical_intf_units` varchar(20) NOT NULL,
-  `loopback0_ipv4_address` varchar(20) NOT NULL,
-  `vlan_id_outer` varchar(20) NOT NULL,
-  `vplspe_uuid` varchar(80) DEFAULT NULL,
-  `image_filename` varchar(100) DEFAULT NULL,
-  `provisioning_status` varchar(10) DEFAULT NULL,
-  `vendor` varchar(20) DEFAULT NULL,
-  PRIMARY KEY (`vplspe_name`,`aic_site_id`,`availability_zone`,`physical_intf_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VPN_BINDINGS`
---
-
-CREATE TABLE IF NOT EXISTS `VPN_BINDINGS` (
-  `network_customization_uuid` varchar(255) NOT NULL,
-  `binding_uuid` varchar(255) NOT NULL,
-  PRIMARY KEY (`network_customization_uuid`,`binding_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VRR_FUNCTION_CODE_VMTYPE_MAPPING`
---
-
-CREATE TABLE IF NOT EXISTS `VRR_FUNCTION_CODE_VMTYPE_MAPPING` (
-  `ptnii_function_code` varchar(128) NOT NULL,
-  `vm_type` varchar(128) NOT NULL,
-  PRIMARY KEY (`ptnii_function_code`,`vm_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VSERVER`
---
-
-CREATE TABLE IF NOT EXISTS `VSERVER` (
-  `tenant_id` varchar(40) NOT NULL,
-  `vserver_id` varchar(40) NOT NULL,
-  `aic_site_id` varchar(100) NOT NULL,
-  `vendor` varchar(20) NOT NULL,
-  `image_name` varchar(100) NOT NULL,
-  `vnf_type` varchar(10) NOT NULL,
-  `vnf_id` varchar(80) NOT NULL,
-  PRIMARY KEY (`tenant_id`,`vserver_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VSERVER2`
---
-
-CREATE TABLE IF NOT EXISTS `VSERVER2` (
-  `tenant_id` varchar(255) NOT NULL,
-  `vserver_id` varchar(128) NOT NULL,
-  `vserver_name` varchar(255) NOT NULL,
-  `vserver_name2` varchar(255) DEFAULT NULL,
-  `prov_status` varchar(20) DEFAULT NULL,
-  `selflink` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`tenant_id`,`vserver_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VSERVER_PSERVER`
---
-
-CREATE TABLE IF NOT EXISTS `VSERVER_PSERVER` (
-  `vserver_id` varchar(128) NOT NULL,
-  `pserver_hostname` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`vserver_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `VVIG_VM_INSTANCE_TO_CLOUD_REGION_MAPPING`
---
-
-CREATE TABLE IF NOT EXISTS `VVIG_VM_INSTANCE_TO_CLOUD_REGION_MAPPING` (
-  `key_id` varchar(128) NOT NULL,
-  `cloud_region` varchar(128) NOT NULL,
-  `key_type` varchar(128) NOT NULL,
-  PRIMARY KEY (`key_id`,`cloud_region`,`key_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `WAN_COMBO_ALLOWABLE`
---
-
-CREATE TABLE IF NOT EXISTS `WAN_COMBO_ALLOWABLE` (
-  `combo_sequence` int(11) NOT NULL AUTO_INCREMENT,
-  `topology` varchar(16) DEFAULT 'unknown',
-  `internet_topology` varchar(20) DEFAULT NULL,
-  `wan1` varchar(40) DEFAULT NULL,
-  `wan2` varchar(40) DEFAULT NULL,
-  `new_start_release_flexware` varchar(16) DEFAULT 'unknown',
-  `is_active_flexware` varchar(1) DEFAULT 'N',
-  `new_start_release_dhv` varchar(16) DEFAULT 'unknown',
-  `is_active_dhv` varchar(1) DEFAULT 'N',
-  `ucpe_type` varchar(32) DEFAULT 'stand-alone',
-  `description` varchar(128) NOT NULL,
-  PRIMARY KEY (`combo_sequence`),
-  UNIQUE KEY `IX1_WAN_COMBO_ALLOWABLE` (`internet_topology`,`wan1`,`wan2`)
-) ENGINE=InnoDB AUTO_INCREMENT=147 DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `DHCP_MAP` (
-  `mac_addr` varchar(128) NOT NULL,
-  `ip_addr` varchar(128) DEFAULT NULL,
-  PRIMARY KEY (`mac_addr`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `RESOURCE_GROUP_TO_TARGET_NODE_MAPPING` (
-  `group_uuid` varchar(255) NOT NULL,
-  `parent_uuid` varchar(255) NOT NULL,
-  `target_node_uuid` varchar(255) NOT NULL,
-  `target_type` varchar(255) NULL,
-  `table_name` varchar(255) NULL,
-  PRIMARY KEY (`group_uuid`, `parent_uuid`, `target_node_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
-
-CREATE TABLE IF NOT EXISTS `ATTRIBUTE_VALUE_PAIR` (
-  `resource_uuid` varchar(255) NOT NULL,
-  `attribute_name` varchar(255) NOT NULL,
-  `resource_type` varchar(255) NOT NULL,
-  `attribute_value` varchar(255) DEFAULT NULL,
-  `resource_customization_uuid` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`resource_uuid`,`attribute_name`,`resource_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `COMPLEX_RESOURCE` (
-  `uuid` varchar(255) NOT NULL,
-  `model_yaml` longblob,
-  `invariant_uuid` varchar(255) NOT NULL,
-  `customization_uuid` varchar(255) NOT NULL,
-  `version` varchar(255) DEFAULT NULL,
-  `name` varchar(255) DEFAULT NULL,
-  `description` varchar(255) DEFAULT NULL,
-  `type` varchar(255) NOT NULL,
-  PRIMARY KEY (`uuid`,`customization_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `NODE_CAPABILITY` (
-  `capability_id` int(11) NOT NULL AUTO_INCREMENT,
-  `capability_provider_uuid` varchar(255) NOT NULL,
-  `capability_provider_customization_uuid` varchar(255) NOT NULL,
-  `capability_name` varchar(255) DEFAULT NULL,
-  `capability_type` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`capability_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=69 DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `NODE_REQUIREMENT` (
-  `requirement_id` int(11) NOT NULL AUTO_INCREMENT,
-  `capability_id` int(11) DEFAULT NULL,
-  `capability_provider_uuid` varchar(255) DEFAULT NULL,
-  `capability_provider_customization_uuid` varchar(255) DEFAULT NULL,
-  `capability_consumer_uuid` varchar(255) NOT NULL,
-  `capability_consumer_customization_uuid` varchar(255) NOT NULL,
-  `requirement_name` varchar(255) NOT NULL,
-  PRIMARY KEY (`requirement_id`),
-  KEY `NODE_REQUIREMENT_TO_NODE_CAPABILITY` (`capability_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `RELATED_NETWORK_ROLE` (
-  `network_model_customization_uuid` varchar(255) NOT NULL,
-  `related_network_role` varchar(255) NOT NULL,
-  PRIMARY KEY (`network_model_customization_uuid`,`related_network_role`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `RESOURCE_GROUP` (
-  `resource_uuid` varchar(255) NOT NULL,
-  `group_uuid` varchar(255) NOT NULL,
-  `group_customization_uuid` varchar(255) DEFAULT NULL,
-  `group_invariant_uuid` varchar(255) NOT NULL,
-  `group_name` varchar(255) DEFAULT NULL,
-  `version` varchar(255) DEFAULT NULL,
-  `group_type` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`resource_uuid`,`group_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `RESOURCE_POLICY` (
-  `resource_uuid` varchar(255) NOT NULL,
-  `policy_uuid` varchar(255) NOT NULL,
-  `policy_customization_uuid` varchar(255) DEFAULT NULL,
-  `policy_invariant_uuid` varchar(255) NOT NULL,
-  `policy_name` varchar(255) DEFAULT NULL,
-  `version` varchar(255) DEFAULT NULL,
-  `policy_type` varchar(255) DEFAULT NULL,
-  `property_type` varchar(255) DEFAULT NULL,
-  `property_source` varchar(255) DEFAULT NULL,
-  `property_name` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`resource_uuid`,`policy_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `RESOURCE_POLICY_TO_TARGET_NODE_MAPPING` (
-  `policy_uuid` varchar(255) NOT NULL,
-  `parent_uuid` varchar(255) NOT NULL,
-  `target_node_uuid` varchar(255) NOT NULL,
-  `target_type` varchar(255) DEFAULT NULL,
-  `target_node_customization_uuid` varchar(255) DEFAULT NULL,
-  `policy_customization_uuid` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`policy_uuid`,`parent_uuid`,`target_node_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
-CREATE TABLE IF NOT EXISTS `SERVICE_MODEL_TO_COMPLEX_RESOURCE_MAPPING` (
-  `service_uuid` varchar(255) NOT NULL,
-  `complex_resource_uuid` varchar(255) NOT NULL,
-  `complex_resource_customization_uuid` varchar(255) NOT NULL,
-  PRIMARY KEY (`service_uuid`,`complex_resource_uuid`,`complex_resource_customization_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `VFC_RELATED_NETWORK_ROLE` (
-  `vfc_customization_uuid` varchar(255) NOT NULL,
-  `vm_type` varchar(255) NOT NULL,
-  `network_role` varchar(255) NOT NULL,
-  `related_network_role` varchar(255) NOT NULL,
-  PRIMARY KEY (`vfc_customization_uuid`,`vm_type`,`network_role`,`related_network_role`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `VNF_RELATED_NETWORK_ROLE` (
-  `vnf_customization_uuid` varchar(255) NOT NULL,
-  `network_role` varchar(255) NOT NULL,
-  `related_network_role` varchar(255) NOT NULL,
-  PRIMARY KEY (`vnf_customization_uuid`,`network_role`,`related_network_role`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE CONFIG_GRA_SERVICES (
-  svcInstanceId varchar(255) not null,
-  serviceStatusAction varchar(255),
-  serviceStatusFinalIndicator varchar(255),
-  serviceStatusRequestStatus varchar(255),
-  serviceStatusResponseCode varchar(255),
-  serviceStatusResponseMessage varchar(255),
-  serviceStatusResponseTimestamp varchar(255),
-  serviceStatusRpcAction varchar(255),
-  serviceStatusRpcName varchar(255),
-  svcData longtext, primary key (svcInstanceId)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 ;
-
-CREATE TABLE OPERATIONAL_GRA_SERVICES (
-  svcInstanceId varchar(255) not null,
-  serviceStatusAction varchar(255),
-  serviceStatusFinalIndicator varchar(255),
-  serviceStatusRequestStatus varchar(255),
-  serviceStatusResponseCode varchar(255),
-  serviceStatusResponseMessage varchar(255),
-  serviceStatusResponseTimestamp varchar(255),
-  serviceStatusRpcAction varchar(255),
-  serviceStatusRpcName varchar(255),
-  svcData longtext,
-  primary key (svcInstanceId)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 ;
-
-CREATE TABLE CONFIG_GRA_PORT_MIRROR_CONFIGURATIONS (
-  configurationId varchar(255) not null,
-  portMirrorConfigurationStatusAction varchar(255),
-  portMirrorConfigurationStatusFinalIndicator varchar(255),
-  portMirrorConfigurationStatusRequestStatus varchar(255),
-  portMirrorConfigurationStatusResponseCode varchar(255),
-  portMirrorConfigurationStatusResponseMessage varchar(255),
-  portMirrorConfigurationStatusResponseTimestamp varchar(255),
-  portMirrorConfigurationStatusRpcAction varchar(255),
-  portMirrorConfigurationStatusRpcName varchar(255),
-  pmcData longtext, primary key (configurationId)
-  ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ;
-
-CREATE TABLE OPERATIONAL_GRA_PORT_MIRROR_CONFIGURATIONS (
-  configurationId varchar(255) not null,
-  portMirrorConfigurationStatusAction varchar(255),
-  portMirrorConfigurationStatusFinalIndicator varchar(255),
-  portMirrorConfigurationStatusRequestStatus varchar(255),
-  portMirrorConfigurationStatusResponseCode varchar(255),
-  portMirrorConfigurationStatusResponseMessage varchar(255),
-  portMirrorConfigurationStatusResponseTimestamp varchar(255),
-  portMirrorConfigurationStatusRpcAction varchar(255),
-  portMirrorConfigurationStatusRpcName varchar(255),
-  pmcData longtext,
-  primary key (configurationId)
-  ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ;
-
-CREATE TABLE CONFIG_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES (
-  allottedResourceId varchar(255) not null,
-  allottedResourceStatusAction varchar(255),
-  allottedResourceStatusFinalIndicator varchar(255),
-  allottedResourceStatusRequestStatus varchar(255),
-  allottedResourceStatusResponseCode varchar(255),
-  allottedResourceStatusResponseMessage varchar(255),
-  allottedResourceStatusResponseTimestamp varchar(255),
-  allottedResourceStatusRpcAction varchar(255),
-  allottedResourceStatusRpcName varchar(255),
-  arData longtext, primary key (allottedResourceId)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 ;
-
-CREATE TABLE OPERATIONAL_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES (
-  allottedResourceId varchar(255) not null,
-  allottedResourceStatusAction varchar(255),
-  allottedResourceStatusFinalIndicator varchar(255),
-  allottedResourceStatusRequestStatus varchar(255),
-  allottedResourceStatusResponseCode varchar(255),
-  allottedResourceStatusResponseMessage varchar(255),
-  allottedResourceStatusResponseTimestamp varchar(255),
-  allottedResourceStatusRpcAction varchar(255),
-  allottedResourceStatusRpcName varchar(255),
-  arData longtext,
-  primary key (allottedResourceId)
-  ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ;
diff --git a/ms/generic-resource-api/src/main/resources/startGra.sh b/ms/generic-resource-api/src/main/resources/startGra.sh
deleted file mode 100644
index e007a52..0000000
--- a/ms/generic-resource-api/src/main/resources/startGra.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-###
-# ============LICENSE_START=======================================================
-# ONAP : SDNC
-# ================================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights
-#                             reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
-
-export SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
-export GRA_JAR=${GRA_JAR:-@sdnc.gra.jar@}
-export SVCLOGIC_DIR=${SVCLOGIC_DIR:-opt/onap/sdnc/svclogic/graphs}
-export LOG_PATH=${LOG_PATH:-/var/log/onap/sdnc}
-export SDNC_CONFIG_DIR=${SDNC_CONFIG_DIR:-/opt/onap/sdnc/config}
-export SDNC_CERT_DIR=${SDNC_CERT_DIR:-${SDNC_CONFIG_DIR}}
-export TRUSTSTORE=${TRUSTSTORE:-truststoreONAPall.jks}
-export JAVA_SECURITY_DIR=${JAVA_SECURITY_DIR:-/etc/ssl/certs/java}
-export CACERT_PASSWORD=${CACERT_PASSWORD:-${TRUSTSTORE_PASSWORD}}
-export MYSQL_DB_HOST=${MYSQL_DB_HOST:-dbhost}
-export SVCLOGIC_PROPERTIES=${SVCLOGIC_PROPERTIES:-${SDNC_CONFIG_DIR}/svclogic.properties}
-
-#
-# Wait for database
-#
-echo "Waiting for database"
-until mysqladmin ping -h ${MYSQL_DB_HOST} --silent; do
-  printf "."
-  sleep 1
-done
-echo -e "\nDatabase ready"
-
-# Create tablespace and user account
-
-#mysql -h ${MYSQL_DB_HOST} -u root -p${MYSQL_ROOT_PASSWORD} mysql <<-END
-#CREATE DATABASE ${MYSQL_DB_DATABASE};
-#CREATE USER '${MYSQL_DB_USER}'@'localhost' IDENTIFIED BY '${MYSQL_DB_PASSWD}';
-#CREATE USER '${MYSQL_DB_USER}'@'%' IDENTIFIED BY '${MYSQL_DB_PASSWD}';
-#GRANT ALL PRIVILEGES ON ${MYSQL_DB_DATABASE}.* TO '${MYSQL_DB_USER}'@'localhost' WITH GRANT OPTION;
-#GRANT ALL PRIVILEGES ON ${MYSQL_DB_DATABASE}.* TO '${MYSQL_DB_USER}'@'%' WITH GRANT OPTION;
-#commit;
-#END
-
-# Initialize schema
-if [ -f ${SDNC_CONFIG_DIR}/schema-mysql.sql ]
-then 
-  mysql -h ${MYSQL_DB_HOST} -u ${MYSQL_USER} -p${MYSQL_PASSWORD} ${MYSQL_DATABASE} < ${SDNC_CONFIG_DIR}/schema-mysql.sql
-fi
-
-# Load data
-if [ -f ${SDNC_CONFIG_DIR}/data-mysql.sql ]
-then 
-  mysql -h ${MYSQL_DB_HOST} -u ${MYSQL_USER} -p${MYSQL_PASSWORD} ${MYSQL_DATABASE} < ${SDNC_CONFIG_DIR}/data-mysql.sql
-fi
-
-if [ ! -f ${SDNC_CERT_DIR}/${TRUSTSTORE} ]; then
-  echo "${SDNC_CERT_DIR}/${TRUSTSTORE} not found ... skipping  ONAP CA cert installation"
-elif [ -z "$TRUSTSTORE_PASSWORD" ]; then
-  echo "TRUSTSTORE_PASSWORD unset - cannot install ONAP CA certs"
-else
-  sudo keytool -importkeystore -srckeystore ${SDNC_CERT_DIR}/${TRUSTSTORE} -srcstorepass ${TRUSTSTORE_PASSWORD} -destkeystore ${JAVA_SECURITY_DIR}/cacerts -deststorepass ${CACERT_PASSWORD}
-  echo -e "\nCerts ready"
-fi
-
-cd $SDNC_HOME
-java -DserviceLogicDirectory=${SVCLOGIC_DIR} -DLOG_PATH=${LOG_PATH} -jar ${SDNC_HOME}/lib/${GRA_JAR}
diff --git a/ms/generic-resource-api/src/main/resources/svclogic.properties b/ms/generic-resource-api/src/main/resources/svclogic.properties
deleted file mode 100644
index 8e49400..0000000
--- a/ms/generic-resource-api/src/main/resources/svclogic.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP : CCSDK
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights
-# 						reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
-
-org.onap.ccsdk.sli.dbtype = jdbc
-org.onap.ccsdk.sli.jdbc.url=jdbc:mariadb://dbhost:3306/${MYSQL_DATABASE}
-org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver
-org.onap.ccsdk.sli.jdbc.database = ${MYSQL_DATABASE}
-org.onap.ccsdk.sli.jdbc.user = ${MYSQL_USER}
-org.onap.ccsdk.sli.jdbc.password = ${MYSQL_PASSWORD}
-
-sliapi.serviceLogicDirectory=/opt/onap/sdnc/svclogic/graphs
diff --git a/ms/generic-resource-api/src/main/resources/truststoreONAPall.jks b/ms/generic-resource-api/src/main/resources/truststoreONAPall.jks
deleted file mode 100644
index ff844b1..0000000
--- a/ms/generic-resource-api/src/main/resources/truststoreONAPall.jks
+++ /dev/null
diff --git a/ms/generic-resource-api/src/main/templates/api.mustache b/ms/generic-resource-api/src/main/templates/api.mustache
deleted file mode 100644
index c28642c..0000000
--- a/ms/generic-resource-api/src/main/templates/api.mustache
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
-* NOTE: This class is auto generated by the swagger code generator program ({{{generatorVersion}}}).
-* https://github.com/swagger-api/swagger-codegen
-* Do not edit the class manually.
-*/
-package {{package}};
-
-{{#imports}}import {{import}};
-{{/imports}}
-{{#jdk8-no-delegate}}
-    import com.fasterxml.jackson.databind.ObjectMapper;
-{{/jdk8-no-delegate}}
-import io.swagger.annotations.*;
-{{#jdk8-no-delegate}}
-    import org.slf4j.Logger;
-    import org.slf4j.LoggerFactory;
-    import org.springframework.http.HttpStatus;
-{{/jdk8-no-delegate}}
-import org.springframework.http.ResponseEntity;
-{{#useBeanValidation}}
-    import org.springframework.validation.annotation.Validated;
-{{/useBeanValidation}}
-import org.springframework.web.bind.annotation.PathVariable;
-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.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.multipart.MultipartFile;
-import org.onap.ccsdk.apps.services.RestException;
-
-{{#jdk8-no-delegate}}
-    import javax.servlet.http.HttpServletRequest;
-{{/jdk8-no-delegate}}
-{{#useBeanValidation}}
-    import javax.validation.Valid;
-    import javax.validation.constraints.*;
-{{/useBeanValidation}}
-{{#jdk8-no-delegate}}
-    import java.io.IOException;
-{{/jdk8-no-delegate}}
-import java.util.List;
-{{#jdk8-no-delegate}}
-    import java.util.Optional;
-{{/jdk8-no-delegate}}
-{{^jdk8-no-delegate}}
-    {{#useOptional}}
-        import java.util.Optional;
-    {{/useOptional}}
-{{/jdk8-no-delegate}}
-{{#async}}
-    import java.util.concurrent.{{^jdk8}}Callable{{/jdk8}}{{#jdk8}}CompletableFuture{{/jdk8}};
-{{/async}}
-{{>generatedAnnotation}}
-@Api(value = "{{{baseName}}}", description = "the {{{baseName}}} API")
-{{#operations}}
-    public interface {{classname}} {
-    {{#jdk8}}
-
-        {{^isDelegate}}
-            Logger log = LoggerFactory.getLogger({{classname}}.class);
-
-            default Optional<ObjectMapper> getObjectMapper() {
-                return Optional.empty();
-                }
-
-                default Optional<HttpServletRequest> getRequest() {
-                return Optional.empty();
-                }
-
-                default Optional<String> getAcceptHeader() {
-                return getRequest().map(r -> r.getHeader("Accept"));
-                }
-        {{/isDelegate}}
-        {{#isDelegate}}
-            {{classname}}Delegate getDelegate();
-        {{/isDelegate}}
-    {{/jdk8}}
-    {{#operation}}
-
-            @ApiOperation(value = "{{{summary}}}", nickname = "{{{operationId}}}", notes = "{{{notes}}}"{{#returnBaseType}}, response = {{{returnBaseType}}}.class{{/returnBaseType}}{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
-        {{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
-        {{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
-        {{/hasMore}}{{/scopes}}
-            }{{/isOAuth}}){{#hasMore}},
-        {{/hasMore}}{{/authMethods}}
-            }{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}",{{/vendorExtensions.x-tags}} })
-            @ApiResponses(value = { {{#responses}}
-                @ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{baseType}}}.class{{/baseType}}{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{#hasMore}},{{/hasMore}}{{/responses}} })
-        {{#implicitHeaders}}
-                @ApiImplicitParams({
-            {{#headerParams}}
-                {{>implicitHeader}}
-            {{/headerParams}}
-                })
-        {{/implicitHeaders}}
-            @RequestMapping(value = "{{{path}}}",{{#singleContentTypes}}
-                produces = "{{{vendorExtensions.x-accepts}}}",
-                consumes = "{{{vendorExtensions.x-contentType}}}",{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}}
-                produces = { {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}}{{#hasConsumes}}
-                consumes = { {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} },{{/hasConsumes}}{{/singleContentTypes}}
-            method = RequestMethod.{{httpMethod}})
-        {{#jdk8}}default {{/jdk8}}{{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{#delegate-method}}_{{/delegate-method}}{{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}){{^jdk8}};{{/jdk8}}{{#jdk8}} throws RestException {
-        {{#delegate-method}}
-                return {{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-                }
-
-                // Override this method
-                default {{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}({{#allParams}}{{^isFile}}{{{dataType}}}{{/isFile}}{{#isFile}}MultipartFile{{/isFile}} {{paramName}}{{#hasMore}},{{/hasMore}}{{/allParams}}) throws RestException {
-        {{/delegate-method}}
-        {{^isDelegate}}
-                if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
-            {{#examples}}
-                    if (getAcceptHeader().get().contains("{{{contentType}}}")) {
-                    try {
-                    return {{#async}}CompletableFuture.completedFuture({{/async}}new ResponseEntity<>(getObjectMapper().get().readValue("{{#lambdaRemoveLineBreak}}{{#lambdaEscapeDoubleQuote}}{{{example}}}{{/lambdaEscapeDoubleQuote}}{{/lambdaRemoveLineBreak}}", {{>exampleReturnTypes}}.class), HttpStatus.NOT_IMPLEMENTED){{#async}}){{/async}};
-                    } catch (IOException e) {
-                    log.error("Couldn't serialize response for content type {{{contentType}}}", e);
-                    return {{#async}}CompletableFuture.completedFuture({{/async}}new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR){{#async}}){{/async}};
-                    }
-                    }
-            {{/examples}}
-                } else {
-                log.warn("ObjectMapper or HttpServletRequest not configured in default {{classname}} interface so no example is generated");
-                }
-                return {{#async}}CompletableFuture.completedFuture({{/async}}new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED){{#async}}){{/async}};
-        {{/isDelegate}}
-        {{#isDelegate}}
-                return getDelegate().{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
-        {{/isDelegate}}
-            }{{/jdk8}}
-
-    {{/operation}}
-        }
-{{/operations}}
-\ No newline at end of file