Refactor GRA to separate docker creation from application code

Refactor GRA so that application jar is created in a separate maven module from the docker build. Issue-ID: SDNC-1527 Change-Id: I4a9af7fe4df14faaf683588bc2567fcc3346886e Signed-off-by: Dan Timoney <dtimoney@att.com>
author: Dan Timoney <dtimoney@att.com> 2021-04-23 13:02:22 -0400
committer: Dan Timoney <dtimoney@att.com> 2021-04-23 15:48:50 -0400
commit: bf2bea4aaee161d82c8093f8b723f0fd9b57a115 (patch)
tree: 0f784c234b444f0479dad7b3eb6fb3c1e502cd6d
parent: 5c4184f9312d00166dea77b5a16ae400c669f473 (diff)
329 files changed, 811 insertions, 418 deletions
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/.swagger-codegen-ignore b/ms/gra/gra-app/.swagger-codegen-ignore
index d8f3f67..d8f3f67 100644
--- a/ms/generic-resource-api/.swagger-codegen-ignore
+++ b/ms/gra/gra-app/.swagger-codegen-ignore
diff --git a/ms/generic-resource-api/generic-resource-api-springboot.iml b/ms/gra/gra-app/generic-resource-api-springboot.iml
index 4a4ce55..4a4ce55 100644
--- a/ms/generic-resource-api/generic-resource-api-springboot.iml
+++ b/ms/gra/gra-app/generic-resource-api-springboot.iml
diff --git a/ms/gra/gra-app/pom.xml b/ms/gra/gra-app/pom.xml
new file mode 100644
index 0000000..475eda5
--- /dev/null
+++ b/ms/gra/gra-app/pom.xml
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.sdnc.apps</groupId>
+        <artifactId>gra</artifactId>
+        <version>2.1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.onap.sdnc.apps</groupId>
+    <artifactId>gra-app</artifactId>
+    <version>2.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>sdnc-apps :: ms :: gra :: ${project.artifactId}</name>
+    <description>Generic Resource API application</description>
+    <url>http://wiki.onap.org</url>
+
+    <properties>
+        <start-class>org.onap.sdnc.apps.ms.gra.GenericResourceMsApp</start-class>
+        <liquibase.properties>${project.basedir}/src/main/resources/liquibase.properties</liquibase.properties>
+        <maven.compiler.source>1.11</maven.compiler.source>
+        <maven.compiler.target>1.11</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+        </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
+		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-client</artifactId>
+            <version>${aaf.cadi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-misc-env</artifactId>
+            <version>${aaf.cadi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-misc-rosetta</artifactId>
+            <version>${aaf.cadi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.apps</groupId>
+            <artifactId>services</artifactId>
+            <version>${ccsdk.apps.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.apps</groupId>
+            <artifactId>sliboot</artifactId>
+            <version>${ccsdk.apps.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-common</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-provider-base</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.logging-analytics</groupId>
+            <artifactId>logging-filter-spring</artifactId>
+            <version>1.6.6</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sliPluginUtils-provider</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>mdsal-resource-provider</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
+            <artifactId>publisher.provider</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>netbox-client-provider</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>sql-resource-provider</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.plugins</groupId>
+            <artifactId>restapi-call-node-provider</artifactId>
+            <version>${ccsdk.sli.plugins.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.plugins</groupId>
+            <artifactId>properties-node-provider</artifactId>
+            <version>${ccsdk.sli.plugins.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+            <version>4.3.0</version>
+        </dependency>
+
+        <!-- this jersey jar is needed for rest api call node to function properly -->
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Necessary to run tests with coverage in IntelliJ -->
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>1.6.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
+
+                <executions>
+                    <execution>
+                        <id>get-gra-yaml</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.onap.sdnc.northbound</groupId>
+                                    <artifactId>generic-resource-api-model-swagger</artifactId>
+                                    <version>${sdnc.northbound.version}</version>
+                                    <type>yaml</type>
+                                    <outputDirectory>${project.build.directory}/yaml</outputDirectory>
+                                    <destFileName>generic-resource.yaml</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <!-- DGs are needed for unit tests as well -->
+                    <execution>
+                        <id>unpack dgs</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.onap.sdnc.oam</groupId>
+                                    <artifactId>platform-logic-installer</artifactId>
+                                    <version>${sdnc.oam.version}</version>
+                                    <type>zip</type>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-codegen-maven-plugin</artifactId>
+                <version>2.3.1</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <output>target/generated-sources</output>
+                            <inputSpec>${project.build.directory}/yaml/generic-resource.yaml</inputSpec>
+                            <language>spring</language>
+                            <apiPackage>org.onap.sdnc.apps.ms.gra.swagger</apiPackage>
+                            <modelPackage>org.onap.sdnc.apps.ms.gra.swagger.model</modelPackage>
+                            <invokerPackage>org.onap.sdnc.apps.ms.gra.swagger</invokerPackage>
+                            <generateApis>true</generateApis>
+                            <generateApiTests>true</generateApiTests>
+                            <ignoreFileOverride>${project.basedir}/.swagger-codegen-ignore</ignoreFileOverride>
+                            <withXml>true</withXml>
+                            <templateDirectory>${project.basedir}/src/main/templates</templateDirectory>
+                            <configOptions>
+                                <java8>true</java8>
+                                <springBootVersion>2.2.4-RELEASE</springBootVersion>
+                            </configOptions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>addSource</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.basedir}/target/generated-sources/src/main/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19.1</version>
+                <configuration>
+                    <environmentVariables>
+                        <SDNC_CONFIG_DIR>${basedir}/src/test/resources</SDNC_CONFIG_DIR>
+                        <SVCLOGIC_PROPERTIES>${basedir}/src/test/resources/svclogic.properties</SVCLOGIC_PROPERTIES>
+                        <MYSQL_DATABASE>${gratest.mysql.database}</MYSQL_DATABASE>
+                        <MYSQL_USER>${gratest.mysql.user}</MYSQL_USER>
+                        <MYSQL_PASSWORD>${gratest.mysql.password}</MYSQL_PASSWORD>
+                    </environmentVariables>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <skipITs>true</skipITs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/FilterConfiguration.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/FilterConfiguration.java
index 6b96541..f63dd97 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/FilterConfiguration.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/FilterConfiguration.java
@@ -4,12 +4,14 @@ 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.autoconfigure.condition.ConditionalOnProperty;
 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
+@ConditionalOnProperty("cadi_prop_files")
 public class FilterConfiguration {
 
     private static final Logger log = LoggerFactory.getLogger(FilterConfiguration.class);
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsApp.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsApp.java
index d436d21..d436d21 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsApp.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsApp.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiController.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiController.java
index 7508eb8..7508eb8 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiController.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiController.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationalApiController.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationalApiController.java
index aeecd63..aeecd63 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationalApiController.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationalApiController.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java
index 6b0a463..6b0a463 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ServiceDataHelper.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ServiceDataHelper.java
index f04a3ac..f04a3ac 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ServiceDataHelper.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ServiceDataHelper.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResources.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResources.java
index 8fcf6d2..8fcf6d2 100755..100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResources.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResources.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResourcesRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResourcesRepository.java
index 9c3aa91..9c3aa91 100755..100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResourcesRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResourcesRepository.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworks.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworks.java
index 1720ac8..1720ac8 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworks.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworks.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworksRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworksRepository.java
index 56fc56c..56fc56c 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworksRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworksRepository.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurations.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurations.java
index cdc5462..cdc5462 100755..100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurations.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurations.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurationsRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurationsRepository.java
index 9ca148b..9ca148b 100755..100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurationsRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurationsRepository.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadData.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadData.java
index a23884d..a23884d 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadData.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadData.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadDataRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadDataRepository.java
index 0ec45b7..0ec45b7 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadDataRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadDataRepository.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServices.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServices.java
index bf5d862..bf5d862 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServices.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServices.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServicesRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServicesRepository.java
index 5b43947..5b43947 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServicesRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServicesRepository.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModules.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModules.java
index d4d5ea5..d4d5ea5 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModules.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModules.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModulesRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModulesRepository.java
index 8203483..8203483 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModulesRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModulesRepository.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfs.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfs.java
index 44337fd..44337fd 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfs.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfs.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfsRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfsRepository.java
index 3909eb3..3909eb3 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfsRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfsRepository.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/NetworksKey.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/NetworksKey.java
index 61f7602..61f7602 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/NetworksKey.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/NetworksKey.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResources.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResources.java
index 51ab88f..51ab88f 100755..100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResources.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResources.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResourcesRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResourcesRepository.java
index c737721..c737721 100755..100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResourcesRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResourcesRepository.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurations.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurations.java
index da9c0ce..da9c0ce 100755..100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurations.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurations.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurationsRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurationsRepository.java
index 1d57c86..1d57c86 100755..100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurationsRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurationsRepository.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadData.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadData.java
index c63926d..c63926d 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadData.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadData.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadDataRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadDataRepository.java
index 34df132..34df132 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadDataRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadDataRepository.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServices.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServices.java
index 5686c4c..5686c4c 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServices.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServices.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServicesRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServicesRepository.java
index 15b2acc..15b2acc 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServicesRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServicesRepository.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/PreloadDataKey.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/PreloadDataKey.java
index 34f010c..34f010c 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/PreloadDataKey.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/PreloadDataKey.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/VfModulesKey.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/VfModulesKey.java
index bf44cc9..bf44cc9 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/VfModulesKey.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/VfModulesKey.java
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/VnfsKey.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/VnfsKey.java
index f19c95e..f19c95e 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/VnfsKey.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/VnfsKey.java
diff --git a/ms/generic-resource-api/src/main/resources/application.properties b/ms/gra/gra-app/src/main/resources/application.properties
index 2be250b..2be250b 100644
--- a/ms/generic-resource-api/src/main/resources/application.properties
+++ b/ms/gra/gra-app/src/main/resources/application.properties
diff --git a/ms/generic-resource-api/src/main/resources/db/changelog/db.changelog-master.yaml b/ms/gra/gra-app/src/main/resources/db/changelog/db.changelog-master.yaml
index 087c324..087c324 100644
--- a/ms/generic-resource-api/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/ms/gra/gra-app/src/main/resources/db/changelog/db.changelog-master.yaml
diff --git a/ms/generic-resource-api/src/main/resources/dblib.properties b/ms/gra/gra-app/src/main/resources/dblib.properties
index 568a9c4..568a9c4 100644
--- a/ms/generic-resource-api/src/main/resources/dblib.properties
+++ b/ms/gra/gra-app/src/main/resources/dblib.properties
diff --git a/ms/generic-resource-api/src/main/resources/generic-resource-api-dg.properties b/ms/gra/gra-app/src/main/resources/generic-resource-api-dg.properties
index 3751142..3751142 100644
--- a/ms/generic-resource-api/src/main/resources/generic-resource-api-dg.properties
+++ b/ms/gra/gra-app/src/main/resources/generic-resource-api-dg.properties
diff --git a/ms/generic-resource-api/src/main/resources/log4j2.properties b/ms/gra/gra-app/src/main/resources/log4j2.properties
index 9bc78a3..9bc78a3 100644
--- a/ms/generic-resource-api/src/main/resources/log4j2.properties
+++ b/ms/gra/gra-app/src/main/resources/log4j2.properties
diff --git a/ms/generic-resource-api/src/main/resources/svclogic.properties b/ms/gra/gra-app/src/main/resources/svclogic.properties
index 8e49400..8e49400 100644
--- a/ms/generic-resource-api/src/main/resources/svclogic.properties
+++ b/ms/gra/gra-app/src/main/resources/svclogic.properties
diff --git a/ms/generic-resource-api/src/main/templates/api.mustache b/ms/gra/gra-app/src/main/templates/api.mustache
index c28642c..c28642c 100644
--- a/ms/generic-resource-api/src/main/templates/api.mustache
+++ b/ms/gra/gra-app/src/main/templates/api.mustache
diff --git a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsIT.java b/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsIT.java
index 7f00c6b..7f00c6b 100644
--- a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsIT.java
+++ b/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsIT.java
diff --git a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java b/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java
index 95226f7..95226f7 100644
--- a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java
+++ b/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java
diff --git a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiServicesControllerTest.java b/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiServicesControllerTest.java
index 6a1b708..6a1b708 100644
--- a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiServicesControllerTest.java
+++ b/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiServicesControllerTest.java
diff --git a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiControllerTest.java b/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiControllerTest.java
index 0b09f1b..0b09f1b 100644
--- a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiControllerTest.java
+++ b/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiControllerTest.java
diff --git a/ms/generic-resource-api/src/test/resources/GR_API.http b/ms/gra/gra-app/src/test/resources/GR_API.http
index 5c5d827..5c5d827 100644
--- a/ms/generic-resource-api/src/test/resources/GR_API.http
+++ b/ms/gra/gra-app/src/test/resources/GR_API.http
diff --git a/ms/generic-resource-api/src/test/resources/allotted-resource-item.json b/ms/gra/gra-app/src/test/resources/allotted-resource-item.json
index 5aa3371..5aa3371 100644
--- a/ms/generic-resource-api/src/test/resources/allotted-resource-item.json
+++ b/ms/gra/gra-app/src/test/resources/allotted-resource-item.json
diff --git a/ms/generic-resource-api/src/test/resources/application.properties b/ms/gra/gra-app/src/test/resources/application.properties
index b397eb9..04dd625 100644
--- a/ms/generic-resource-api/src/test/resources/application.properties
+++ b/ms/gra/gra-app/src/test/resources/application.properties
@@ -20,4 +20,4 @@ spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.Im
 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
 spring.jpa.database=derby
 serviceLogicProperties=src/test/resources/svclogic.properties
-serviceLogicDirectory=target/docker-stage/opt/onap/sdnc/svclogic/graphs/generic-resource-api
+serviceLogicDirectory=target/svclogic/graphs/generic-resource-api
diff --git a/ms/generic-resource-api/src/test/resources/contrail-route-allotted-resource-1.json b/ms/gra/gra-app/src/test/resources/contrail-route-allotted-resource-1.json
index 193002a..193002a 100644
--- a/ms/generic-resource-api/src/test/resources/contrail-route-allotted-resource-1.json
+++ b/ms/gra/gra-app/src/test/resources/contrail-route-allotted-resource-1.json
diff --git a/ms/generic-resource-api/src/test/resources/db/changelog/db.changelog-master.yaml b/ms/gra/gra-app/src/test/resources/db/changelog/db.changelog-master.yaml
index 29d98e6..29d98e6 100644
--- a/ms/generic-resource-api/src/test/resources/db/changelog/db.changelog-master.yaml
+++ b/ms/gra/gra-app/src/test/resources/db/changelog/db.changelog-master.yaml
diff --git a/ms/generic-resource-api/src/test/resources/dblib.properties b/ms/gra/gra-app/src/test/resources/dblib.properties
index 08093c3..08093c3 100644
--- a/ms/generic-resource-api/src/test/resources/dblib.properties
+++ b/ms/gra/gra-app/src/test/resources/dblib.properties
diff --git a/ms/generic-resource-api/src/test/resources/generic-resource-api-dg.properties b/ms/gra/gra-app/src/test/resources/generic-resource-api-dg.properties
index 3751142..3751142 100644
--- a/ms/generic-resource-api/src/test/resources/generic-resource-api-dg.properties
+++ b/ms/gra/gra-app/src/test/resources/generic-resource-api-dg.properties
diff --git a/ms/generic-resource-api/src/test/resources/network-assign-rpc.json b/ms/gra/gra-app/src/test/resources/network-assign-rpc.json
index 2398ef5..2398ef5 100644
--- a/ms/generic-resource-api/src/test/resources/network-assign-rpc.json
+++ b/ms/gra/gra-app/src/test/resources/network-assign-rpc.json
diff --git a/ms/generic-resource-api/src/test/resources/policy-update-notify-rpc.json b/ms/gra/gra-app/src/test/resources/policy-update-notify-rpc.json
index 6e1c101..6e1c101 100644
--- a/ms/generic-resource-api/src/test/resources/policy-update-notify-rpc.json
+++ b/ms/gra/gra-app/src/test/resources/policy-update-notify-rpc.json
diff --git a/ms/generic-resource-api/src/test/resources/port-mirror-assign-rpc.json b/ms/gra/gra-app/src/test/resources/port-mirror-assign-rpc.json
index 0b9b0b3..0b9b0b3 100644
--- a/ms/generic-resource-api/src/test/resources/port-mirror-assign-rpc.json
+++ b/ms/gra/gra-app/src/test/resources/port-mirror-assign-rpc.json
diff --git a/ms/generic-resource-api/src/test/resources/port-mirror-configuration-1.json b/ms/gra/gra-app/src/test/resources/port-mirror-configuration-1.json
index 446235d..446235d 100644
--- a/ms/generic-resource-api/src/test/resources/port-mirror-configuration-1.json
+++ b/ms/gra/gra-app/src/test/resources/port-mirror-configuration-1.json
diff --git a/ms/generic-resource-api/src/test/resources/port-mirror-configuration-item.json b/ms/gra/gra-app/src/test/resources/port-mirror-configuration-item.json
index 780d079..780d079 100644
--- a/ms/generic-resource-api/src/test/resources/port-mirror-configuration-item.json
+++ b/ms/gra/gra-app/src/test/resources/port-mirror-configuration-item.json
diff --git a/ms/generic-resource-api/src/test/resources/preload1-net-list-item.json b/ms/gra/gra-app/src/test/resources/preload1-net-list-item.json
index 4a91388..4a91388 100644
--- a/ms/generic-resource-api/src/test/resources/preload1-net-list-item.json
+++ b/ms/gra/gra-app/src/test/resources/preload1-net-list-item.json
diff --git a/ms/generic-resource-api/src/test/resources/preload1-net-model-info.json b/ms/gra/gra-app/src/test/resources/preload1-net-model-info.json
index 586915a..586915a 100644
--- a/ms/generic-resource-api/src/test/resources/preload1-net-model-info.json
+++ b/ms/gra/gra-app/src/test/resources/preload1-net-model-info.json
diff --git a/ms/generic-resource-api/src/test/resources/preload1-net-preload-data.json b/ms/gra/gra-app/src/test/resources/preload1-net-preload-data.json
index 74da3de..74da3de 100644
--- a/ms/generic-resource-api/src/test/resources/preload1-net-preload-data.json
+++ b/ms/gra/gra-app/src/test/resources/preload1-net-preload-data.json
diff --git a/ms/generic-resource-api/src/test/resources/preload1-rpc-network.json b/ms/gra/gra-app/src/test/resources/preload1-rpc-network.json
index 04bea9e..04bea9e 100644
--- a/ms/generic-resource-api/src/test/resources/preload1-rpc-network.json
+++ b/ms/gra/gra-app/src/test/resources/preload1-rpc-network.json
diff --git a/ms/generic-resource-api/src/test/resources/preload1-rpc-vfmodule.json b/ms/gra/gra-app/src/test/resources/preload1-rpc-vfmodule.json
index 12553b0..12553b0 100644
--- a/ms/generic-resource-api/src/test/resources/preload1-rpc-vfmodule.json
+++ b/ms/gra/gra-app/src/test/resources/preload1-rpc-vfmodule.json
diff --git a/ms/generic-resource-api/src/test/resources/preload2-net-list-item.json b/ms/gra/gra-app/src/test/resources/preload2-net-list-item.json
index 65a7bc4..65a7bc4 100644
--- a/ms/generic-resource-api/src/test/resources/preload2-net-list-item.json
+++ b/ms/gra/gra-app/src/test/resources/preload2-net-list-item.json
diff --git a/ms/generic-resource-api/src/test/resources/preload2-net-model-info.json b/ms/gra/gra-app/src/test/resources/preload2-net-model-info.json
index 2b7b12e..2b7b12e 100644
--- a/ms/generic-resource-api/src/test/resources/preload2-net-model-info.json
+++ b/ms/gra/gra-app/src/test/resources/preload2-net-model-info.json
diff --git a/ms/generic-resource-api/src/test/resources/preload2.json b/ms/gra/gra-app/src/test/resources/preload2.json
index 009d548..009d548 100644
--- a/ms/generic-resource-api/src/test/resources/preload2.json
+++ b/ms/gra/gra-app/src/test/resources/preload2.json
diff --git a/ms/generic-resource-api/src/test/resources/service-assign-rpc.json b/ms/gra/gra-app/src/test/resources/service-assign-rpc.json
index 96f6b2b..96f6b2b 100644
--- a/ms/generic-resource-api/src/test/resources/service-assign-rpc.json
+++ b/ms/gra/gra-app/src/test/resources/service-assign-rpc.json
diff --git a/ms/generic-resource-api/src/test/resources/service1-service.json b/ms/gra/gra-app/src/test/resources/service1-service.json
index abf7da2..abf7da2 100644
--- a/ms/generic-resource-api/src/test/resources/service1-service.json
+++ b/ms/gra/gra-app/src/test/resources/service1-service.json
diff --git a/ms/generic-resource-api/src/test/resources/service1-service_vnf.json b/ms/gra/gra-app/src/test/resources/service1-service_vnf.json
index 973b668..973b668 100644
--- a/ms/generic-resource-api/src/test/resources/service1-service_vnf.json
+++ b/ms/gra/gra-app/src/test/resources/service1-service_vnf.json
diff --git a/ms/generic-resource-api/src/test/resources/service1-servicedata.json b/ms/gra/gra-app/src/test/resources/service1-servicedata.json
index 8521b76..8521b76 100644
--- a/ms/generic-resource-api/src/test/resources/service1-servicedata.json
+++ b/ms/gra/gra-app/src/test/resources/service1-servicedata.json
diff --git a/ms/generic-resource-api/src/test/resources/service1-serviceitem.json b/ms/gra/gra-app/src/test/resources/service1-serviceitem.json
index aad2096..aad2096 100644
--- a/ms/generic-resource-api/src/test/resources/service1-serviceitem.json
+++ b/ms/gra/gra-app/src/test/resources/service1-serviceitem.json
diff --git a/ms/generic-resource-api/src/test/resources/service1-servicestatus.json b/ms/gra/gra-app/src/test/resources/service1-servicestatus.json
index ca763d3..ca763d3 100644
--- a/ms/generic-resource-api/src/test/resources/service1-servicestatus.json
+++ b/ms/gra/gra-app/src/test/resources/service1-servicestatus.json
diff --git a/ms/generic-resource-api/src/test/resources/service1-vfmodule-item.json b/ms/gra/gra-app/src/test/resources/service1-vfmodule-item.json
index 67e5b3c..67e5b3c 100644
--- a/ms/generic-resource-api/src/test/resources/service1-vfmodule-item.json
+++ b/ms/gra/gra-app/src/test/resources/service1-vfmodule-item.json
diff --git a/ms/generic-resource-api/src/test/resources/service1.json b/ms/gra/gra-app/src/test/resources/service1.json
index 00b9b4b..00b9b4b 100644
--- a/ms/generic-resource-api/src/test/resources/service1.json
+++ b/ms/gra/gra-app/src/test/resources/service1.json
diff --git a/ms/generic-resource-api/src/test/resources/service9.json b/ms/gra/gra-app/src/test/resources/service9.json
index aef12ab..aef12ab 100644
--- a/ms/generic-resource-api/src/test/resources/service9.json
+++ b/ms/gra/gra-app/src/test/resources/service9.json
diff --git a/ms/generic-resource-api/src/test/resources/svclogic.properties b/ms/gra/gra-app/src/test/resources/svclogic.properties
index c716e13..c716e13 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic.properties
+++ b/ms/gra/gra-app/src/test/resources/svclogic.properties
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_aai-get-aic-zone.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_aai-get-aic-zone.xml
index 5f174c6..5f174c6 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_aai-get-aic-zone.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_aai-get-aic-zone.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_aai-get-network-instance-group.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_aai-get-network-instance-group.xml
index 7383c3f..7383c3f 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_aai-get-network-instance-group.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_aai-get-network-instance-group.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-activate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-activate.xml
index 658cee1..658cee1 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-activate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-activate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-create.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-create.xml
index 674e547..674e547 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-create.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-create.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-deactivate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-deactivate.xml
index c49f2eb..c49f2eb 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-deactivate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-deactivate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-delete.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-delete.xml
index d1ef588..d1ef588 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-delete.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-delete.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_assign-vlan-tags.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_assign-vlan-tags.xml
index f23891c..f23891c 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_assign-vlan-tags.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_assign-vlan-tags.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_auto-ip-assignment.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_auto-ip-assignment.xml
index 77fdb44..77fdb44 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_auto-ip-assignment.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_auto-ip-assignment.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml
index 9417333..9417333 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
index 75d15b5..75d15b5 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml
index 2ba5835..2ba5835 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml
index 3b98365..3b98365 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.xml
index 37bb23d..37bb23d 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml
index d41dfd5..d41dfd5 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml
index 2d88b3f..2d88b3f 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml
index ea6dde9..ea6dde9 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml
index 4aa36b9..4aa36b9 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-common-huawei.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-common-huawei.xml
index 4f67b46..4f67b46 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-common-huawei.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-common-huawei.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml
index fb07393..fb07393 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml
index cebb55f..cebb55f 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
index 5e1fbe7..5e1fbe7 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
index 21f0efb..21f0efb 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-create.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-create.xml
index 54c99cb..54c99cb 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-create.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-create.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
index 0fda417..0fda417 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml
index 40effac..40effac 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml
index 0a01dd9..0a01dd9 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation.xml
index 90a9389..90a9389 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_connection-attachment-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_connection-attachment-topology-operation.xml
index 7376942..7376942 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_connection-attachment-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_connection-attachment-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-activate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-activate.xml
index 06756c6..06756c6 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-activate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-activate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml
index 444b50d..444b50d 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-create.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-create.xml
index 2f3c907..2f3c907 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-create.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-create.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-deactivate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-deactivate.xml
index 5fc21d2..5fc21d2 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-deactivate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-deactivate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-delete.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-delete.xml
index c57b5f9..c57b5f9 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-delete.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-delete.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-unassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-unassign.xml
index e4cbfc2..e4cbfc2 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-unassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-unassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation.xml
index 3b4b87e..3b4b87e 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_create-l3-subnet.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_create-l3-subnet.xml
index c7e3454..c7e3454 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_create-l3-subnet.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_create-l3-subnet.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_create-route-target-and-vpn-binding.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_create-route-target-and-vpn-binding.xml
index f9866fe..f9866fe 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_create-route-target-and-vpn-binding.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_create-route-target-and-vpn-binding.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
index 411cbb3..411cbb3 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
index d70691b..d70691b 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-allocate-generic-subnet.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-allocate-generic-subnet.xml
index 1e6c8bb..1e6c8bb 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-allocate-generic-subnet.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-allocate-generic-subnet.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml
index 8fd6376..8fd6376 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-create-generic-pool.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-create-generic-pool.xml
index 1940615..1940615 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-create-generic-pool.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-create-generic-pool.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-create-network-role-pool.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-create-network-role-pool.xml
index 49436b4..49436b4 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-create-network-role-pool.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-create-network-role-pool.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-FQPN.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-FQPN.xml
index b9699d6..b9699d6 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-FQPN.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-FQPN.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-allottedresource-id.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-allottedresource-id.xml
index b6792ad..b6792ad 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-allottedresource-id.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-allottedresource-id.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-host-routes-host-route-id.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-host-routes-host-route-id.xml
index 928e3a8..928e3a8 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-host-routes-host-route-id.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-host-routes-host-route-id.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-l3network-network-id.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-l3network-network-id.xml
index e44c148..e44c148 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-l3network-network-id.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-l3network-network-id.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-panorama-name.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-panorama-name.xml
index b31a9ff..b31a9ff 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-panorama-name.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-panorama-name.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-subnets-subnet-id.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-subnets-subnet-id.xml
index 14ba7fe..14ba7fe 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-subnets-subnet-id.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-subnets-subnet-id.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-unique-name.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-unique-name.xml
index 7393842..7393842 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-unique-name.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-unique-name.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-vpn-binding-id.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-vpn-binding-id.xml
index 1a981fa..1a981fa 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-vpn-binding-id.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-vpn-binding-id.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-activate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-activate.xml
index 3ee1bbc..3ee1bbc 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-activate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-activate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-assign.xml
index 5db9776..5db9776 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-deactivate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-deactivate.xml
index 88fcf35..88fcf35 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-deactivate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-deactivate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-unassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-unassign.xml
index a3c5fff..a3c5fff 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-unassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-unassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification.xml
index 34bfcec..34bfcec 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-topology-operation.xml
index 56f0d74..56f0d74 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-complex-resource-service-model.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-complex-resource-service-model.xml
index 07a0486..07a0486 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-complex-resource-service-model.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-complex-resource-service-model.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-data-from-policy.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-data-from-policy.xml
index 2c825d6..2c825d6 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-data-from-policy.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-data-from-policy.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml
index be34b3b..be34b3b 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml
index a844fa5..a844fa5 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-composite-match-pair.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-composite-match-pair.xml
index 0fb35de..0fb35de 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-composite-match-pair.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-composite-match-pair.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-create-composite-path.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-create-composite-path.xml
index 76b8df4..76b8df4 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-create-composite-path.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-create-composite-path.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-create-simple-path.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-create-simple-path.xml
index 71d3c77..71d3c77 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-create-simple-path.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-create-simple-path.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-populate-from-grapi.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-populate-from-grapi.xml
index 1ae609a..1ae609a 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-populate-from-grapi.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-populate-from-grapi.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-populate-from-vnfapi.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-populate-from-vnfapi.xml
index e84e426..e84e426 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-populate-from-vnfapi.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-populate-from-vnfapi.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-simple-match-pair.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-simple-match-pair.xml
index 049f22e..049f22e 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-simple-match-pair.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-simple-match-pair.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-topology-operation-create.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-topology-operation-create.xml
index 77d04d7..77d04d7 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-topology-operation-create.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-topology-operation-create.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-topology-operation.xml
index e6c2c9d..e6c2c9d 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_gw-vfmodule-update.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_gw-vfmodule-update.xml
index f738418..f738418 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_gw-vfmodule-update.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_gw-vfmodule-update.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_manage-ipaddr-assignment.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_manage-ipaddr-assignment.xml
index 724faf3..724faf3 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_manage-ipaddr-assignment.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_manage-ipaddr-assignment.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_manage-vni-assignment.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_manage-vni-assignment.xml
index 169d20b..169d20b 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_manage-vni-assignment.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_manage-vni-assignment.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_naming-policy-generate-name.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_naming-policy-generate-name.xml
index 2f6def6..2f6def6 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_naming-policy-generate-name.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_naming-policy-generate-name.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_naming-policy-generate-unique-name.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_naming-policy-generate-unique-name.xml
index 23aece7..23aece7 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_naming-policy-generate-unique-name.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_naming-policy-generate-unique-name.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-activate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-activate.xml
index ed5130a..ed5130a 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-activate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-activate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-automated.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-automated.xml
index 4de5c5f..4de5c5f 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-automated.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-automated.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml
index a8251fc..a8251fc 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-vlantagging-instancegroup.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-vlantagging-instancegroup.xml
index 56c9f6a..56c9f6a 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-vlantagging-instancegroup.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-vlantagging-instancegroup.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign.xml
index d4cdd89..d4cdd89 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-changeassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-changeassign.xml
index 7d0155a..7d0155a 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-changeassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-changeassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-create.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-create.xml
index b3e2b21..b3e2b21 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-create.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-create.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-deactivate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-deactivate.xml
index 54c8a75..54c8a75 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-deactivate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-deactivate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-delete.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
index 0624045..0624045 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-unassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-unassign.xml
index 1b8a7d2..1b8a7d2 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-unassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-unassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation.xml
index 51d6b6a..51d6b6a 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-activate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-activate.xml
index a382b02..a382b02 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-activate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-activate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml
index f25087e..f25087e 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-deactivate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-deactivate.xml
index 5cb8438..5cb8438 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-deactivate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-deactivate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.xml
index 48bffb4..48bffb4 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation.xml
index 8ab8729..8ab8729 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-manager-create-policy.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-manager-create-policy.xml
index c6d45de..c6d45de 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-manager-create-policy.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-manager-create-policy.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-manager-delete-policy.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-manager-delete-policy.xml
index e5bcb09..e5bcb09 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-manager-delete-policy.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-manager-delete-policy.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-update-notify-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-update-notify-operation.xml
index a0d77fd..a0d77fd 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-update-notify-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-update-notify-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-get-policy.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-get-policy.xml
index a5e7438..a5e7438 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-get-policy.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-get-policy.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-rollback-capacity-db.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-rollback-capacity-db.xml
index 7b1ab18..7b1ab18 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-rollback-capacity-db.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-rollback-capacity-db.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-activate-async.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-activate-async.xml
index 0d95f40..0d95f40 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-activate-async.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-activate-async.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-activate-sync.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-activate-sync.xml
index d95950e..d95950e 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-activate-sync.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-activate-sync.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-async.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-async.xml
index edb5557..edb5557 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-async.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-async.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-sync.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-sync.xml
index 2cdd98d..2cdd98d 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-sync.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-sync.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-async.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-async.xml
index 8b07ec1..8b07ec1 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-async.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-async.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-create-vnfcs.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-create-vnfcs.xml
index 0860c6b..0860c6b 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-create-vnfcs.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-create-vnfcs.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-deactivate-async.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-deactivate-async.xml
index 50c52fb..50c52fb 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-deactivate-async.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-deactivate-async.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-deactivate-sync.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-deactivate-sync.xml
index 4a1fc27..4a1fc27 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-deactivate-sync.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-deactivate-sync.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-disable.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-disable.xml
index 0be852c..0be852c 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-disable.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-disable.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-enable.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-enable.xml
index b6d8c6d..b6d8c6d 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-enable.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-enable.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-mapping-pprobe.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-mapping-pprobe.xml
index aaead56..aaead56 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-mapping-pprobe.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-mapping-pprobe.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-mapping-vprobe.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-mapping-vprobe.xml
index 5421853..5421853 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-mapping-vprobe.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-mapping-vprobe.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-unassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-unassign.xml
index 673c513..673c513 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-unassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-unassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-validation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-validation.xml
index 5a8dad5..5a8dad5 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-validation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-validation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation.xml
index fb3cdb2..fb3cdb2 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_preload-network-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_preload-network-topology-operation.xml
index 2558152..2558152 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_preload-network-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_preload-network-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_preload-vf-module-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_preload-vf-module-topology-operation.xml
index 91fd4a7..91fd4a7 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_preload-vf-module-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_preload-vf-module-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_process-eipam-pools.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_process-eipam-pools.xml
index 0f27169..0f27169 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_process-eipam-pools.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_process-eipam-pools.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_process-generic-eipam-pools.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_process-generic-eipam-pools.xml
index d713d23..d713d23 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_process-generic-eipam-pools.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_process-generic-eipam-pools.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_query-aai-l3-network-by-network-role.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_query-aai-l3-network-by-network-role.xml
index 64e5765..64e5765 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_query-aai-l3-network-by-network-role.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_query-aai-l3-network-by-network-role.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_rollback-eipam-ip-assignment.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_rollback-eipam-ip-assignment.xml
index 6a4ca1b..6a4ca1b 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_rollback-eipam-ip-assignment.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_rollback-eipam-ip-assignment.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_rollback-generated-names.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_rollback-generated-names.xml
index 41a6468..41a6468 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_rollback-generated-names.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_rollback-generated-names.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-activate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-activate.xml
index f49173a..f49173a 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-activate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-activate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-assign.xml
index cb8450b..cb8450b 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-create.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-create.xml
index a234d0d..a234d0d 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-create.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-create.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-deactivate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-deactivate.xml
index 14ecf29..14ecf29 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-deactivate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-deactivate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-delete.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-delete.xml
index acad449..acad449 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-delete.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-delete.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-unassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-unassign.xml
index 0f11b39..0f11b39 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-unassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-unassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation.xml
index 5cb18ae..5cb18ae 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-pnf-put.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-pnf-put.xml
index 6631d89..6631d89 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-pnf-put.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-pnf-put.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml
index c64485b..c64485b 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml
index 877c272..877c272 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml
index d3dce91..d3dce91 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml
index a8ef58d..a8ef58d 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-generate-name.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-generate-name.xml
index c6b5a9a..c6b5a9a 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-generate-name.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-generate-name.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-mS-mac-address-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-mS-mac-address-assign.xml
index 60c749a..60c749a 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-mS-mac-address-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-mS-mac-address-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-mS-vlan-tag-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-mS-vlan-tag-assign.xml
index 0b2cde9..0b2cde9 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-mS-vlan-tag-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-mS-vlan-tag-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
index 4cf5cdb..4cf5cdb 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-assign.xml
index 55d851c..55d851c 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.xml
index bded0cb..bded0cb 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml
index cff4d49..cff4d49 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-unassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-unassign.xml
index 2fc4a3a..2fc4a3a 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-unassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-unassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml
index 75f5a3f..75f5a3f 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.xml
index b2746cf..b2746cf 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml
index 551364f..551364f 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.xml
index 2e62832..2e62832 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-unresolved-composite-data.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-unresolved-composite-data.xml
index ebd065a..ebd065a 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-unresolved-composite-data.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-unresolved-composite-data.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
index d2bb3a0..d2bb3a0 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.xml
index 1c5e077..1c5e077 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.xml
index e2dc3e3..e2dc3e3 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.xml
index 01ec0d4..01ec0d4 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.xml
index 76b6087..76b6087 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-unassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-unassign.xml
index 68df95e..68df95e 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-unassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-unassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml
index 543b9f5..543b9f5 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
index 9038e67..9038e67 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
index 96db3ef..96db3ef 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.xml
index 16da1bb..16da1bb 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-forking-logic.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-forking-logic.xml
index 3570e5d..3570e5d 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-forking-logic.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-forking-logic.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.xml
index c8a419a..c8a419a 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.xml
index 4a87679..4a87679 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml
index a35b4c1..a35b4c1 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
index 420bdf3..420bdf3 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
index b640fbf..b640fbf 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_send-so-response.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_send-so-response.xml
index aee8feb..aee8feb 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_send-so-response.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_send-so-response.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-assign.xml
index 300c1a9..300c1a9 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-changeassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-changeassign.xml
index c018b1a..c018b1a 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-changeassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-changeassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-deactivate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-deactivate.xml
index 89cc3eb..89cc3eb 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-deactivate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-deactivate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-delete.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-delete.xml
index 5270874..5270874 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-delete.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-delete.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation.xml
index 1cf7718..1cf7718 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml
index 4d75a2f..4d75a2f 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
index 58f73f8..58f73f8 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml
index 8071065..8071065 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml
index dc24e03..dc24e03 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml
index d70fb60..d70fb60 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml
index eaab7f2..eaab7f2 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation.xml
index 277b74d..277b74d 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-api-contrail-route-input.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-api-contrail-route-input.xml
index bf041b1..bf041b1 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-api-contrail-route-input.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-api-contrail-route-input.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.xml
index 73bb52d..73bb52d 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-bbs-vnf-input-parameters.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-bbs-vnf-input-parameters.xml
index 7f72fbd..7f72fbd 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-bbs-vnf-input-parameters.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-bbs-vnf-input-parameters.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-brg-input.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-brg-input.xml
index 57b493f..57b493f 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-brg-input.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-brg-input.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-connection-attachment-input.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-connection-attachment-input.xml
index ec0301a..ec0301a 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-connection-attachment-input.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-connection-attachment-input.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-contrail-route-input.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-contrail-route-input.xml
index 421335d..421335d 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-contrail-route-input.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-contrail-route-input.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-generic-configuration-input.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-generic-configuration-input.xml
index cc1bc1a..cc1bc1a 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-generic-configuration-input.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-generic-configuration-input.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-getpathsegment-input.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-getpathsegment-input.xml
index 3489544..3489544 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-getpathsegment-input.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-getpathsegment-input.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-network-input-parameters.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
index 0987a77..0987a77 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-network-input.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-network-input.xml
index 87cf448..87cf448 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-network-input.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-network-input.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml
index 2e16622..2e16622 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-pnf-input.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-pnf-input.xml
index 3c1ae0d..3c1ae0d 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-pnf-input.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-pnf-input.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-security-zone-input.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-security-zone-input.xml
index 0aaa7ba..0aaa7ba 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-security-zone-input.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-security-zone-input.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-service-input.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-service-input.xml
index ca1c3a4..ca1c3a4 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-service-input.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-service-input.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml
index 58b7467..58b7467 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-vf-module-input.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-vf-module-input.xml
index f21ff99..f21ff99 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-vf-module-input.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-vf-module-input.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-vnf-input.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-vnf-input.xml
index 6de5257..6de5257 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-vnf-input.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-vnf-input.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-generate-heat-parameters.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-generate-heat-parameters.xml
index 0324511..0324511 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-generate-heat-parameters.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-generate-heat-parameters.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-assign-rollback.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-assign-rollback.xml
index edbbcca..edbbcca 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-assign-rollback.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-assign-rollback.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.xml
index e5f823a..e5f823a 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml
index 923303a..923303a 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-no-preload.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-no-preload.xml
index fd1ca63..fd1ca63 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-no-preload.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-no-preload.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-preload.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-preload.xml
index 879f000..879f000 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-preload.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-preload.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml
index 19ee62a..19ee62a 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
index f1f9ca1..f1f9ca1 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml
index e0527fb..e0527fb 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-changeassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-changeassign.xml
index 93eaf71..93eaf71 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-changeassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-changeassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-deactivate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-deactivate.xml
index 4f31a9f..4f31a9f 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-deactivate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-deactivate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-unassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-unassign.xml
index 4586dad..4586dad 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-unassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-unassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
index fa9cbd9..fa9cbd9 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-activate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-activate.xml
index 42c29a7..42c29a7 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-activate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-activate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-assign.xml
index f451812..f451812 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-deactivate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-deactivate.xml
index b39e116..b39e116 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-deactivate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-deactivate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-ip-addresses.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-ip-addresses.xml
index 9a7a73b..9a7a73b 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-ip-addresses.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-ip-addresses.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-get-resource-request.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-get-resource-request.xml
index d602cc0..d602cc0 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-get-resource-request.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-get-resource-request.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-activate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-activate.xml
index 78f1abe..78f1abe 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-activate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-activate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml
index 61b4226..61b4226 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign-sync.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign-sync.xml
index 2ad5a46..2ad5a46 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign-sync.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign-sync.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
index 9c6089f..9c6089f 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml
index 64183eb..64183eb 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-changeassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-changeassign.xml
index a45713f..a45713f 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-changeassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-changeassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-deactivate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-deactivate.xml
index 7665486..7665486 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-deactivate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-deactivate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml
index 32e922e..32e922e 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation.xml
index 9b8f9a0..9b8f9a0 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.xml
index b11e740..b11e740 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-create.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-create.xml
index d3b24d4..d3b24d4 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-create.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-create.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-deactivate.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-deactivate.xml
index 592fb65..592fb65 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-deactivate.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-deactivate.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-delete.xml b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-delete.xml
index 9c24e52..9c24e52 100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-delete.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-delete.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/SUBNET-API_managed-network-notification.xml b/ms/gra/gra-app/src/test/resources/svclogic/SUBNET-API_managed-network-notification.xml
index 1654a83..1654a83 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/SUBNET-API_managed-network-notification.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/SUBNET-API_managed-network-notification.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/SUBNET-API_subnet-allocated-notification.xml b/ms/gra/gra-app/src/test/resources/svclogic/SUBNET-API_subnet-allocated-notification.xml
index c1ed57c..c1ed57c 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/SUBNET-API_subnet-allocated-notification.xml
+++ b/ms/gra/gra-app/src/test/resources/svclogic/SUBNET-API_subnet-allocated-notification.xml
diff --git a/ms/generic-resource-api/src/test/resources/svclogic/graph.versions b/ms/gra/gra-app/src/test/resources/svclogic/graph.versions
index efe46f0..efe46f0 100755..100644
--- a/ms/generic-resource-api/src/test/resources/svclogic/graph.versions
+++ b/ms/gra/gra-app/src/test/resources/svclogic/graph.versions
diff --git a/ms/generic-resource-api/src/test/resources/testing.http b/ms/gra/gra-app/src/test/resources/testing.http
index ae17c53..ae17c53 100644
--- a/ms/generic-resource-api/src/test/resources/testing.http
+++ b/ms/gra/gra-app/src/test/resources/testing.http
diff --git a/ms/generic-resource-api/src/test/resources/vf-module-assign-rpc.json b/ms/gra/gra-app/src/test/resources/vf-module-assign-rpc.json
index 11def71..11def71 100644
--- a/ms/generic-resource-api/src/test/resources/vf-module-assign-rpc.json
+++ b/ms/gra/gra-app/src/test/resources/vf-module-assign-rpc.json
diff --git a/ms/generic-resource-api/src/test/resources/vf-module-unassign-rpc.json b/ms/gra/gra-app/src/test/resources/vf-module-unassign-rpc.json
index 4d1695d..4d1695d 100644
--- a/ms/generic-resource-api/src/test/resources/vf-module-unassign-rpc.json
+++ b/ms/gra/gra-app/src/test/resources/vf-module-unassign-rpc.json
diff --git a/ms/generic-resource-api/src/test/resources/vnf-assign-rpc.json b/ms/gra/gra-app/src/test/resources/vnf-assign-rpc.json
index b0f6817..b0f6817 100644
--- a/ms/generic-resource-api/src/test/resources/vnf-assign-rpc.json
+++ b/ms/gra/gra-app/src/test/resources/vnf-assign-rpc.json
diff --git a/ms/generic-resource-api/src/test/resources/vnf-data.json b/ms/gra/gra-app/src/test/resources/vnf-data.json
index 1250ade..1250ade 100644
--- a/ms/generic-resource-api/src/test/resources/vnf-data.json
+++ b/ms/gra/gra-app/src/test/resources/vnf-data.json
diff --git a/ms/generic-resource-api/src/test/resources/vnf-get-resource-request-expected.json b/ms/gra/gra-app/src/test/resources/vnf-get-resource-request-expected.json
index 719c4dc..719c4dc 100644
--- a/ms/generic-resource-api/src/test/resources/vnf-get-resource-request-expected.json
+++ b/ms/gra/gra-app/src/test/resources/vnf-get-resource-request-expected.json
diff --git a/ms/generic-resource-api/src/test/resources/vnf-get-resource-request-rpc.json b/ms/gra/gra-app/src/test/resources/vnf-get-resource-request-rpc.json
index 7438deb..7438deb 100644
--- a/ms/generic-resource-api/src/test/resources/vnf-get-resource-request-rpc.json
+++ b/ms/gra/gra-app/src/test/resources/vnf-get-resource-request-rpc.json
diff --git a/ms/generic-resource-api/src/test/resources/vnf-level-oper-status.json b/ms/gra/gra-app/src/test/resources/vnf-level-oper-status.json
index 1778cab..1778cab 100644
--- a/ms/generic-resource-api/src/test/resources/vnf-level-oper-status.json
+++ b/ms/gra/gra-app/src/test/resources/vnf-level-oper-status.json
diff --git a/ms/generic-resource-api/src/test/resources/vnf-onap-model-info.json b/ms/gra/gra-app/src/test/resources/vnf-onap-model-info.json
index d44dc49..d44dc49 100644
--- a/ms/generic-resource-api/src/test/resources/vnf-onap-model-info.json
+++ b/ms/gra/gra-app/src/test/resources/vnf-onap-model-info.json
diff --git a/ms/generic-resource-api/src/test/resources/vnf-vnf-networks-network-role.json b/ms/gra/gra-app/src/test/resources/vnf-vnf-networks-network-role.json
index d435c4a..d435c4a 100644
--- a/ms/generic-resource-api/src/test/resources/vnf-vnf-networks-network-role.json
+++ b/ms/gra/gra-app/src/test/resources/vnf-vnf-networks-network-role.json
diff --git a/ms/generic-resource-api/src/test/resources/vnf-vnf-networks.json b/ms/gra/gra-app/src/test/resources/vnf-vnf-networks.json
index 3f73cba..3f73cba 100644
--- a/ms/generic-resource-api/src/test/resources/vnf-vnf-networks.json
+++ b/ms/gra/gra-app/src/test/resources/vnf-vnf-networks.json
diff --git a/ms/generic-resource-api/pom.xml b/ms/gra/gra-docker/pom.xml
index 416eaca..af9b80c 100644
--- a/ms/generic-resource-api/pom.xml
+++ b/ms/gra/gra-docker/pom.xml
@@ -4,356 +4,39 @@
 
     <parent>
         <groupId>org.onap.sdnc.apps</groupId>
-        <artifactId>sdnc-apps-ms</artifactId>
+        <artifactId>gra</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.apps</groupId>
-    <artifactId>generic-resource-api</artifactId>
+    <artifactId>gra-docker</artifactId>
     <version>2.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>sdnc-apps :: ms :: ${project.artifactId}</name>
-    <description>POM to be used for yang2swagger generation of client in SDNC project</description>
+    <name>sdnc-apps :: ms :: gra :: ${project.artifactId}</name>
+    <description>Generic Resource API docker creation</description>
     <url>http://wiki.onap.org</url>
 
     <properties>
-        <start-class>org.onap.sdnc.apps.ms.gra.GenericResourceMsApp</start-class>
-        <aaf.cadi.version>2.1.21</aaf.cadi.version>
-        <ccsdk.apps.version>1.2.0-SNAPSHOT</ccsdk.apps.version>
-        <ccsdk.docker.version>1.1-STAGING-latest</ccsdk.docker.version>
-        <sdnc.northbound.version>2.2.0-SNAPSHOT</sdnc.northbound.version>
-        <sdnc.oam.version>2.2.0-SNAPSHOT</sdnc.oam.version>
-
         <base.image.name>onap/ccsdk-alpine-j11-image</base.image.name>
         <image.name>onap/sdnc-gra-image</image.name>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-        <sdnc.gra.jar>${project.artifactId}-${project.version}.jar</sdnc.gra.jar>
+        <sdnc.gra.jar>gra-app-${project.version}.jar</sdnc.gra.jar>
+        <onap.truststore>truststoreONAPall.jks</onap.truststore>
         <docker.push.phase>deploy</docker.push.phase>
-        <docker.verbose>true</docker.verbose>
-        <gratest.mysql.database>testdb</gratest.mysql.database>
-        <gratest.mysql.root.password>itsASecret</gratest.mysql.root.password>
-        <gratest.mysql.user>testdb</gratest.mysql.user>
-        <gratest.mysql.password>test123</gratest.mysql.password>
         <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
-        <liquibase.properties>${project.basedir}/src/main/resources/liquibase.properties</liquibase.properties>
-
-        <maven.compiler.source>1.11</maven.compiler.source>
-        <maven.compiler.target>1.11</maven.compiler.target>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-        </dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
-		</dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-xml</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aaf.authz</groupId>
-            <artifactId>aaf-auth-client</artifactId>
-            <version>${aaf.cadi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aaf.authz</groupId>
-            <artifactId>aaf-misc-env</artifactId>
-            <version>${aaf.cadi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.aaf.authz</groupId>
-            <artifactId>aaf-misc-rosetta</artifactId>
-            <version>${aaf.cadi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.apps</groupId>
-            <artifactId>services</artifactId>
-            <version>${ccsdk.apps.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.apps</groupId>
-            <artifactId>sliboot</artifactId>
-            <version>${ccsdk.apps.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.core</groupId>
-            <artifactId>sli-common</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.core</groupId>
-            <artifactId>sli-provider-base</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.logging-analytics</groupId>
-            <artifactId>logging-filter-spring</artifactId>
-            <version>1.6.6</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.core</groupId>
-            <artifactId>sliPluginUtils-provider</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-            <artifactId>mdsal-resource-provider</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
-            <artifactId>publisher.provider</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-            <artifactId>netbox-client-provider</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-            <artifactId>sql-resource-provider</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.plugins</groupId>
-            <artifactId>restapi-call-node-provider</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.plugins</groupId>
-            <artifactId>properties-node-provider</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.liquibase</groupId>
-            <artifactId>liquibase-core</artifactId>
-            <version>4.3.0</version>
-        </dependency>
-
-        <!-- this jersey jar is needed for rest api call node to function properly -->
-        <dependency>
-            <groupId>org.glassfish.jersey.inject</groupId>
-            <artifactId>jersey-hk2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- Necessary to run tests with coverage in IntelliJ -->
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-launcher</artifactId>
-            <version>1.6.2</version>
-            <scope>test</scope>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gra-app</artifactId>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>${basedir}/../../TagVersion.groovy</source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.10</version>
-
-                <executions>
-                    <execution>
-                        <id>get-gra-yaml</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.onap.sdnc.northbound</groupId>
-                                    <artifactId>generic-resource-api-model-swagger</artifactId>
-                                    <version>${sdnc.northbound.version}</version>
-                                    <type>yaml</type>
-                                    <outputDirectory>${project.build.directory}/yaml</outputDirectory>
-                                    <destFileName>generic-resource.yaml</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <!-- DGs are needed for unit tests as well -->
-                    <execution>
-                        <id>unpack dgs</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc</outputDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.onap.sdnc.oam</groupId>
-                                    <artifactId>platform-logic-installer</artifactId>
-                                    <version>${sdnc.oam.version}</version>
-                                    <type>zip</type>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-codegen-maven-plugin</artifactId>
-                <version>2.3.1</version>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                        <configuration>
-                            <output>target/generated-sources</output>
-                            <inputSpec>${project.build.directory}/yaml/generic-resource.yaml</inputSpec>
-                            <language>spring</language>
-                            <apiPackage>org.onap.sdnc.apps.ms.gra.swagger</apiPackage>
-                            <modelPackage>org.onap.sdnc.apps.ms.gra.swagger.model</modelPackage>
-                            <invokerPackage>org.onap.sdnc.apps.ms.gra.swagger</invokerPackage>
-                            <generateApis>true</generateApis>
-                            <generateApiTests>true</generateApiTests>
-                            <ignoreFileOverride>${project.basedir}/.swagger-codegen-ignore</ignoreFileOverride>
-                            <withXml>true</withXml>
-                            <templateDirectory>${project.basedir}/src/main/templates</templateDirectory>
-                            <configOptions>
-                                <java8>true</java8>
-                                <springBootVersion>2.2.4-RELEASE</springBootVersion>
-                            </configOptions>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.0.0</version>
-                <executions>
-                    <execution>
-                        <id>addSource</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.basedir}/target/generated-sources/src/main/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
-                <configuration>
-                    <environmentVariables>
-                        <SDNC_CONFIG_DIR>${basedir}/src/test/resources</SDNC_CONFIG_DIR>
-                        <SVCLOGIC_PROPERTIES>${basedir}/src/test/resources/svclogic.properties</SVCLOGIC_PROPERTIES>
-                        <MYSQL_DATABASE>${gratest.mysql.database}</MYSQL_DATABASE>
-                        <MYSQL_USER>${gratest.mysql.user}</MYSQL_USER>
-                        <MYSQL_PASSWORD>${gratest.mysql.password}</MYSQL_PASSWORD>
-                    </environmentVariables>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <skipITs>true</skipITs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
     <profiles>
         <profile>
@@ -361,6 +44,21 @@
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.codehaus.groovy.maven</groupId>
+                        <artifactId>gmaven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>execute</goal>
+                                </goals>
+                                <configuration>
+                                    <source>${basedir}/../../../TagVersion.groovy</source>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
                         <version>2.10</version>
@@ -383,8 +81,27 @@
                                     <copyPom>false</copyPom>
                                 </configuration>
                             </execution>
+                            <execution>
+                                <id>unpack dgs</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc</outputDirectory>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.onap.sdnc.oam</groupId>
+                                            <artifactId>platform-logic-installer</artifactId>
+                                            <version>${sdnc.oam.version}</version>
+                                            <type>zip</type>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
                         </executions>
                     </plugin>
+
                     <plugin>
                         <artifactId>maven-resources-plugin</artifactId>
                         <version>2.6</version>
@@ -430,39 +147,39 @@
                                 </configuration>
                             </execution>
                             <execution>
-                                <id>copy-script</id>
+                                <id>copy-jks</id>
                                 <goals>
                                     <goal>copy-resources</goal>
                                 </goals> <!-- here the phase you need -->
                                 <phase>generate-resources</phase>
                                 <configuration>
-                                    <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/bin</outputDirectory>
+                                    <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/config</outputDirectory>
                                     <resources>
                                         <resource>
                                             <directory>src/main/resources</directory>
                                             <includes>
-                                                <include>*.sh</include>
+                                                <include>*.jks</include>
                                             </includes>
-                                            <filtering>true</filtering>
+                                            <filtering>false</filtering>
                                         </resource>
                                     </resources>
                                 </configuration>
                             </execution>
                             <execution>
-                                <id>copy-jar</id>
+                                <id>copy-script</id>
                                 <goals>
                                     <goal>copy-resources</goal>
                                 </goals> <!-- here the phase you need -->
-                                <phase>package</phase>
+                                <phase>generate-resources</phase>
                                 <configuration>
-                                    <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/lib</outputDirectory>
+                                    <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/bin</outputDirectory>
                                     <resources>
                                         <resource>
-                                            <directory>${basedir}/target</directory>
+                                            <directory>src/main/resources</directory>
                                             <includes>
-                                                <include>${sdnc.gra.jar}</include>
+                                                <include>*.sh</include>
                                             </includes>
-                                            <filtering>false</filtering>
+                                            <filtering>true</filtering>
                                         </resource>
                                     </resources>
                                 </configuration>
diff --git a/ms/generic-resource-api/src/main/dc/docker-compose.yaml b/ms/gra/gra-docker/src/main/dc/docker-compose.yaml
index 37a5807..37a5807 100755..100644
--- a/ms/generic-resource-api/src/main/dc/docker-compose.yaml
+++ b/ms/gra/gra-docker/src/main/dc/docker-compose.yaml
diff --git a/ms/generic-resource-api/src/main/docker/Dockerfile b/ms/gra/gra-docker/src/main/docker/Dockerfile
index 79dda69..37c2ee6 100644
--- a/ms/generic-resource-api/src/main/docker/Dockerfile
+++ b/ms/gra/gra-docker/src/main/docker/Dockerfile
@@ -3,11 +3,17 @@
 FROM @base.image.name@:@ccsdk.docker.version@ AS stage0
 
 ENV LOG_PATH /var/log/onap/sdnc
+ENV SDNC_CONFIG_DIR /opt/onap/sdnc/config
+ENV TRUSTSTORE @onap.truststore@
+ENV JAVA_SECURITY_DIR /opt/java/openjdk/lib/security
 USER root
 
 # copy deliverables to opt
 COPY opt /opt
 
+# Install ONAP certificates
+RUN keytool -importkeystore -srckeystore ${SDNC_CONFIG_DIR}/${TRUSTSTORE} -srcstorepass changeit -destkeystore ${JAVA_SECURITY_DIR}/cacerts -deststorepass changeit -noprompt
+
 ## END OF STAGE0 ##
 
 
@@ -28,7 +34,6 @@ 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
 
diff --git a/ms/gra/gra-docker/src/main/resources/application.properties b/ms/gra/gra-docker/src/main/resources/application.properties
new file mode 100644
index 0000000..2be250b
--- /dev/null
+++ b/ms/gra/gra-docker/src/main/resources/application.properties
@@ -0,0 +1,24 @@
+
+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/gra/gra-docker/src/main/resources/data-demo.sql
index 763d0cb..763d0cb 100644
--- a/ms/generic-resource-api/src/main/resources/data-demo.sql
+++ b/ms/gra/gra-docker/src/main/resources/data-demo.sql
diff --git a/ms/gra/gra-docker/src/main/resources/dblib.properties b/ms/gra/gra-docker/src/main/resources/dblib.properties
new file mode 100644
index 0000000..5c14341
--- /dev/null
+++ b/ms/gra/gra-docker/src/main/resources/dblib.properties
@@ -0,0 +1,38 @@
+###
+# ============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://${MYSQL_DB_HOST}: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/gra/gra-docker/src/main/resources/generic-resource-api-dg.properties b/ms/gra/gra-docker/src/main/resources/generic-resource-api-dg.properties
new file mode 100644
index 0000000..3751142
--- /dev/null
+++ b/ms/gra/gra-docker/src/main/resources/generic-resource-api-dg.properties
@@ -0,0 +1,77 @@
+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/gra/gra-docker/src/main/resources/log4j2.properties b/ms/gra/gra-docker/src/main/resources/log4j2.properties
new file mode 100644
index 0000000..9bc78a3
--- /dev/null
+++ b/ms/gra/gra-docker/src/main/resources/log4j2.properties
@@ -0,0 +1,163 @@
+ #-
+ # ============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/gra/gra-docker/src/main/resources/org.onap.sdnc.cred.props
index e702d61..e702d61 100644
--- a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.cred.props
+++ b/ms/gra/gra-docker/src/main/resources/org.onap.sdnc.cred.props
diff --git a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.keyfile b/ms/gra/gra-docker/src/main/resources/org.onap.sdnc.keyfile
index eb8fe84..eb8fe84 100644
--- a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.keyfile
+++ b/ms/gra/gra-docker/src/main/resources/org.onap.sdnc.keyfile
diff --git a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.p12 b/ms/gra/gra-docker/src/main/resources/org.onap.sdnc.p12
index 23a701a..23a701a 100644
--- a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.p12
+++ b/ms/gra/gra-docker/src/main/resources/org.onap.sdnc.p12
diff --git a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.props b/ms/gra/gra-docker/src/main/resources/org.onap.sdnc.props
index adef904..adef904 100644
--- a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.props
+++ b/ms/gra/gra-docker/src/main/resources/org.onap.sdnc.props
diff --git a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.trust.jks b/ms/gra/gra-docker/src/main/resources/org.onap.sdnc.trust.jks
index 7a69861..7a69861 100644
--- a/ms/generic-resource-api/src/main/resources/org.onap.sdnc.trust.jks
+++ b/ms/gra/gra-docker/src/main/resources/org.onap.sdnc.trust.jks
diff --git a/ms/generic-resource-api/src/main/resources/schema-demo.sql b/ms/gra/gra-docker/src/main/resources/schema-demo.sql
index ddd3217..ddd3217 100644
--- a/ms/generic-resource-api/src/main/resources/schema-demo.sql
+++ b/ms/gra/gra-docker/src/main/resources/schema-demo.sql
diff --git a/ms/gra/gra-docker/src/main/resources/startGra.sh b/ms/gra/gra-docker/src/main/resources/startGra.sh
new file mode 100644
index 0000000..6bca0e0
--- /dev/null
+++ b/ms/gra/gra-docker/src/main/resources/startGra.sh
@@ -0,0 +1,42 @@
+#!/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 MYSQL_DB_HOST=${MYSQL_DB_HOST:-dbhost}
+export SVCLOGIC_PROPERTIES=${SVCLOGIC_PROPERTIES:-${SDNC_CONFIG_DIR}/svclogic.properties}
+
+cd $SDNC_HOME
+
+  echo "Waiting for mysql"
+  until mysql -h ${MYSQL_DB_HOST} -u ${MYSQL_USER} -p${MYSQL_PASSWORD} ${MYSQL_DATABASE} &> /dev/null
+  do
+    printf "."
+    sleep 1
+  done
+  echo -e "\nmysql ready"
+  
+java -DserviceLogicDirectory=${SVCLOGIC_DIR} -DLOG_PATH=${LOG_PATH} -jar ${SDNC_HOME}/lib/${GRA_JAR}
diff --git a/ms/gra/gra-docker/src/main/resources/svclogic.properties b/ms/gra/gra-docker/src/main/resources/svclogic.properties
new file mode 100644
index 0000000..8e49400
--- /dev/null
+++ b/ms/gra/gra-docker/src/main/resources/svclogic.properties
@@ -0,0 +1,29 @@
+###
+# ============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/gra/gra-docker/src/main/resources/truststoreONAPall.jks
index ff844b1..ff844b1 100644
--- a/ms/generic-resource-api/src/main/resources/truststoreONAPall.jks
+++ b/ms/gra/gra-docker/src/main/resources/truststoreONAPall.jks
diff --git a/ms/gra/pom.xml b/ms/gra/pom.xml
new file mode 100644
index 0000000..8a421db
--- /dev/null
+++ b/ms/gra/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.apps
+ * ================================================================================
+ * Copyright (C) 2018 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=========================================================
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.sdnc.apps</groupId>
+        <artifactId>sdnc-apps-ms</artifactId>
+        <version>2.1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>gra</artifactId>
+    <version>2.1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>sdnc-apps :: ms :: ${project.artifactId}</name>
+    <description>Generic Resource API microservice</description>
+    
+    <properties>
+        <aaf.cadi.version>2.1.21</aaf.cadi.version>
+        <ccsdk.apps.version>1.2.0-SNAPSHOT</ccsdk.apps.version>
+        <ccsdk.docker.version>1.1-STAGING-latest</ccsdk.docker.version>
+        <sdnc.northbound.version>2.2.0-SNAPSHOT</sdnc.northbound.version>
+        <sdnc.oam.version>2.2.0-SNAPSHOT</sdnc.oam.version>
+        <gratest.mysql.database>testdb</gratest.mysql.database>
+        <gratest.mysql.root.password>itsASecret</gratest.mysql.root.password>
+        <gratest.mysql.user>testdb</gratest.mysql.user>
+        <gratest.mysql.password>test123</gratest.mysql.password>
+    </properties>
+
+    <modules>
+        <module>gra-app</module>
+        <module>gra-docker</module>
+    </modules>
+</project>
diff --git a/ms/pom.xml b/ms/pom.xml
index 0a32898..059c531 100644
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -36,6 +36,6 @@
     <description>Micro-services</description>
 
     <modules>
-        <module>generic-resource-api</module>
+        <module>gra</module>
     </modules>
 </project>
author	Dan Timoney <dtimoney@att.com>	2021-04-23 13:02:22 -0400
committer	Dan Timoney <dtimoney@att.com>	2021-04-23 15:48:50 -0400
commit	bf2bea4aaee161d82c8093f8b723f0fd9b57a115 (patch)
tree	0f784c234b444f0479dad7b3eb6fb3c1e502cd6d
parent	5c4184f9312d00166dea77b5a16ae400c669f473 (diff)