From bf2bea4aaee161d82c8093f8b723f0fd9b57a115 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 23 Apr 2021 13:02:22 -0400 Subject: [PATCH] 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 --- .../src/main/resources/startGra.sh | 79 ----- .../gra-app}/.swagger-codegen-ignore | 0 .../gra-app}/generic-resource-api-springboot.iml | 0 ms/gra/gra-app/pom.xml | 321 +++++++++++++++++ .../onap/sdnc/apps/ms/gra/FilterConfiguration.java | 2 + .../sdnc/apps/ms/gra/GenericResourceMsApp.java | 0 .../ms/gra/controllers/ConfigApiController.java | 0 .../gra/controllers/OperationalApiController.java | 0 .../gra/controllers/OperationsApiController.java | 0 .../apps/ms/gra/controllers/ServiceDataHelper.java | 0 .../data/ConfigContrailRouteAllottedResources.java | 0 ...igContrailRouteAllottedResourcesRepository.java | 0 .../onap/sdnc/apps/ms/gra/data/ConfigNetworks.java | 0 .../apps/ms/gra/data/ConfigNetworksRepository.java | 0 .../gra/data/ConfigPortMirrorConfigurations.java | 0 .../ConfigPortMirrorConfigurationsRepository.java | 0 .../sdnc/apps/ms/gra/data/ConfigPreloadData.java | 0 .../ms/gra/data/ConfigPreloadDataRepository.java | 0 .../onap/sdnc/apps/ms/gra/data/ConfigServices.java | 0 .../apps/ms/gra/data/ConfigServicesRepository.java | 0 .../sdnc/apps/ms/gra/data/ConfigVfModules.java | 0 .../ms/gra/data/ConfigVfModulesRepository.java | 0 .../org/onap/sdnc/apps/ms/gra/data/ConfigVnfs.java | 0 .../apps/ms/gra/data/ConfigVnfsRepository.java | 0 .../onap/sdnc/apps/ms/gra/data/NetworksKey.java | 0 .../OperationalContrailRouteAllottedResources.java | 0 ...alContrailRouteAllottedResourcesRepository.java | 0 .../data/OperationalPortMirrorConfigurations.java | 0 ...rationalPortMirrorConfigurationsRepository.java | 0 .../apps/ms/gra/data/OperationalPreloadData.java | 0 .../gra/data/OperationalPreloadDataRepository.java | 0 .../sdnc/apps/ms/gra/data/OperationalServices.java | 0 .../ms/gra/data/OperationalServicesRepository.java | 0 .../onap/sdnc/apps/ms/gra/data/PreloadDataKey.java | 0 .../onap/sdnc/apps/ms/gra/data/VfModulesKey.java | 0 .../org/onap/sdnc/apps/ms/gra/data/VnfsKey.java | 0 .../src/main/resources/application.properties | 0 .../db/changelog/db.changelog-master.yaml | 0 .../gra-app}/src/main/resources/dblib.properties | 0 .../resources/generic-resource-api-dg.properties | 0 .../gra-app}/src/main/resources/log4j2.properties | 0 .../src/main/resources/svclogic.properties | 0 .../gra-app}/src/main/templates/api.mustache | 0 .../onap/sdnc/apps/ms/gra/GenericResourceMsIT.java | 0 .../ConfigApiPreloadControllerTest.java | 0 .../ConfigApiServicesControllerTest.java | 0 .../controllers/OperationsApiControllerTest.java | 0 .../gra-app}/src/test/resources/GR_API.http | 0 .../src/test/resources/allotted-resource-item.json | 0 .../src/test/resources/application.properties | 2 +- .../contrail-route-allotted-resource-1.json | 0 .../db/changelog/db.changelog-master.yaml | 0 .../gra-app}/src/test/resources/dblib.properties | 0 .../resources/generic-resource-api-dg.properties | 0 .../src/test/resources/network-assign-rpc.json | 0 .../test/resources/policy-update-notify-rpc.json | 0 .../src/test/resources/port-mirror-assign-rpc.json | 0 .../resources/port-mirror-configuration-1.json | 0 .../resources/port-mirror-configuration-item.json | 0 .../src/test/resources/preload1-net-list-item.json | 0 .../test/resources/preload1-net-model-info.json | 0 .../test/resources/preload1-net-preload-data.json | 0 .../src/test/resources/preload1-rpc-network.json | 0 .../src/test/resources/preload1-rpc-vfmodule.json | 0 .../src/test/resources/preload2-net-list-item.json | 0 .../test/resources/preload2-net-model-info.json | 0 .../gra-app}/src/test/resources/preload2.json | 0 .../src/test/resources/service-assign-rpc.json | 0 .../src/test/resources/service1-service.json | 0 .../src/test/resources/service1-service_vnf.json | 0 .../src/test/resources/service1-servicedata.json | 0 .../src/test/resources/service1-serviceitem.json | 0 .../src/test/resources/service1-servicestatus.json | 0 .../src/test/resources/service1-vfmodule-item.json | 0 .../gra-app}/src/test/resources/service1.json | 0 .../gra-app}/src/test/resources/service9.json | 0 .../src/test/resources/svclogic.properties | 0 .../GENERIC-RESOURCE-API_aai-get-aic-zone.xml | 0 ...RESOURCE-API_aai-get-network-instance-group.xml | 0 ...-contrail-route-topology-operation-activate.xml | 0 ...pi-contrail-route-topology-operation-create.xml | 0 ...ontrail-route-topology-operation-deactivate.xml | 0 ...pi-contrail-route-topology-operation-delete.xml | 0 .../GENERIC-RESOURCE-API_assign-vlan-tags.xml | 0 .../GENERIC-RESOURCE-API_auto-ip-assignment.xml | 0 ...ty-network-topology-operation-create-huawei.xml | 0 ...ty-network-topology-operation-delete-huawei.xml | 0 ...tivity-vnf-topology-operation-create-huawei.xml | 0 ...tivity-vnf-topology-operation-delete-huawei.xml | 0 ...le-network-topology-operation-change-huawei.xml | 0 ...le-network-topology-operation-common-huawei.xml | 0 ...le-network-topology-operation-create-huawei.xml | 0 ...le-network-topology-operation-delete-huawei.xml | 0 ...rofile-vnf-topology-operation-change-huawei.xml | 0 ...rofile-vnf-topology-operation-common-huawei.xml | 0 ...rofile-vnf-topology-operation-create-huawei.xml | 0 ...rofile-vnf-topology-operation-delete-huawei.xml | 0 ...ESOURCE-API_brg-topology-operation-activate.xml | 0 ...-RESOURCE-API_brg-topology-operation-assign.xml | 0 ...-RESOURCE-API_brg-topology-operation-create.xml | 0 ...OURCE-API_brg-topology-operation-deactivate.xml | 0 ...-RESOURCE-API_brg-topology-operation-delete.xml | 0 ...ESOURCE-API_brg-topology-operation-unassign.xml | 0 ...GENERIC-RESOURCE-API_brg-topology-operation.xml | 0 ...PI_connection-attachment-topology-operation.xml | 0 ..._contrail-route-topology-operation-activate.xml | 0 ...PI_contrail-route-topology-operation-assign.xml | 0 ...PI_contrail-route-topology-operation-create.xml | 0 ...ontrail-route-topology-operation-deactivate.xml | 0 ...PI_contrail-route-topology-operation-delete.xml | 0 ..._contrail-route-topology-operation-unassign.xml | 0 ...OURCE-API_contrail-route-topology-operation.xml | 0 .../GENERIC-RESOURCE-API_create-l3-subnet.xml | 0 ...RCE-API_create-route-target-and-vpn-binding.xml | 0 ...onnects-network-topology-operation-activate.xml | 0 ...nects-network-topology-operation-deactivate.xml | 0 ...-RESOURCE-API_eipam-allocate-generic-subnet.xml | 0 ...URCE-API_eipam-allocate-network-role-subnet.xml | 0 ...ERIC-RESOURCE-API_eipam-create-generic-pool.xml | 0 ...RESOURCE-API_eipam-create-network-role-pool.xml | 0 .../GENERIC-RESOURCE-API_generate-FQPN.xml | 0 ...C-RESOURCE-API_generate-allottedresource-id.xml | 0 ...URCE-API_generate-host-routes-host-route-id.xml | 0 ...-RESOURCE-API_generate-l3network-network-id.xml | 0 ...GENERIC-RESOURCE-API_generate-panorama-name.xml | 0 ...RIC-RESOURCE-API_generate-subnets-subnet-id.xml | 0 .../GENERIC-RESOURCE-API_generate-unique-name.xml | 0 ...ENERIC-RESOURCE-API_generate-vpn-binding-id.xml | 0 ...generic-configuration-notification-activate.xml | 0 ...I_generic-configuration-notification-assign.xml | 0 ...neric-configuration-notification-deactivate.xml | 0 ...generic-configuration-notification-unassign.xml | 0 ...URCE-API_generic-configuration-notification.xml | 0 ...PI_generic-configuration-topology-operation.xml | 0 ...URCE-API_get-complex-resource-service-model.xml | 0 .../GENERIC-RESOURCE-API_get-data-from-policy.xml | 0 .../GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml | 0 ...IC-RESOURCE-API_get-vnf-api-parent-instance.xml | 0 ...RCE-API_getpathsegment-composite-match-pair.xml | 0 ...CE-API_getpathsegment-create-composite-path.xml | 0 ...OURCE-API_getpathsegment-create-simple-path.xml | 0 ...URCE-API_getpathsegment-populate-from-grapi.xml | 0 ...RCE-API_getpathsegment-populate-from-vnfapi.xml | 0 ...SOURCE-API_getpathsegment-simple-match-pair.xml | 0 ...PI_getpathsegment-topology-operation-create.xml | 0 ...OURCE-API_getpathsegment-topology-operation.xml | 0 .../GENERIC-RESOURCE-API_gw-vfmodule-update.xml | 0 ...NERIC-RESOURCE-API_manage-ipaddr-assignment.xml | 0 .../GENERIC-RESOURCE-API_manage-vni-assignment.xml | 0 ...IC-RESOURCE-API_naming-policy-generate-name.xml | 0 ...URCE-API_naming-policy-generate-unique-name.xml | 0 ...RCE-API_network-topology-operation-activate.xml | 0 ...network-topology-operation-assign-automated.xml | 0 ...work-topology-operation-assign-from-preload.xml | 0 ...-operation-assign-vlantagging-instancegroup.xml | 0 ...OURCE-API_network-topology-operation-assign.xml | 0 ...API_network-topology-operation-changeassign.xml | 0 ...OURCE-API_network-topology-operation-create.xml | 0 ...E-API_network-topology-operation-deactivate.xml | 0 ...OURCE-API_network-topology-operation-delete.xml | 0 ...RCE-API_network-topology-operation-unassign.xml | 0 ...RIC-RESOURCE-API_network-topology-operation.xml | 0 ...ESOURCE-API_pnf-topology-operation-activate.xml | 0 ...-RESOURCE-API_pnf-topology-operation-assign.xml | 0 ...OURCE-API_pnf-topology-operation-deactivate.xml | 0 ...ESOURCE-API_pnf-topology-operation-unassign.xml | 0 ...GENERIC-RESOURCE-API_pnf-topology-operation.xml | 0 ...C-RESOURCE-API_policy-manager-create-policy.xml | 0 ...C-RESOURCE-API_policy-manager-delete-policy.xml | 0 ...RESOURCE-API_policy-update-notify-operation.xml | 0 ...GENERIC-RESOURCE-API_port-mirror-get-policy.xml | 0 ...SOURCE-API_port-mirror-rollback-capacity-db.xml | 0 ...rt-mirror-topology-operation-activate-async.xml | 0 ...ort-mirror-topology-operation-activate-sync.xml | 0 ...port-mirror-topology-operation-assign-async.xml | 0 ..._port-mirror-topology-operation-assign-sync.xml | 0 ...CE-API_port-mirror-topology-operation-async.xml | 0 ...port-mirror-topology-operation-create-vnfcs.xml | 0 ...-mirror-topology-operation-deactivate-async.xml | 0 ...t-mirror-topology-operation-deactivate-sync.xml | 0 ...-API_port-mirror-topology-operation-disable.xml | 0 ...E-API_port-mirror-topology-operation-enable.xml | 0 ...rt-mirror-topology-operation-mapping-pprobe.xml | 0 ...rt-mirror-topology-operation-mapping-vprobe.xml | 0 ...API_port-mirror-topology-operation-unassign.xml | 0 ...I_port-mirror-topology-operation-validation.xml | 0 ...RESOURCE-API_port-mirror-topology-operation.xml | 0 ...URCE-API_preload-network-topology-operation.xml | 0 ...CE-API_preload-vf-module-topology-operation.xml | 0 .../GENERIC-RESOURCE-API_process-eipam-pools.xml | 0 ...IC-RESOURCE-API_process-generic-eipam-pools.xml | 0 ...CE-API_query-aai-l3-network-by-network-role.xml | 0 ...C-RESOURCE-API_rollback-eipam-ip-assignment.xml | 0 ...NERIC-RESOURCE-API_rollback-generated-names.xml | 0 ...I_security-zone-topology-operation-activate.xml | 0 ...API_security-zone-topology-operation-assign.xml | 0 ...API_security-zone-topology-operation-create.xml | 0 ...security-zone-topology-operation-deactivate.xml | 0 ...API_security-zone-topology-operation-delete.xml | 0 ...I_security-zone-topology-operation-unassign.xml | 0 ...SOURCE-API_security-zone-topology-operation.xml | 0 ...GENERIC-RESOURCE-API_self-serve-aai-pnf-put.xml | 0 ...C-RESOURCE-API_self-serve-aai-vf-module-put.xml | 0 ...GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml | 0 ...-API_self-serve-capability-param-resolution.xml | 0 ...E-API_self-serve-generate-name-changeassign.xml | 0 ...NERIC-RESOURCE-API_self-serve-generate-name.xml | 0 ...SOURCE-API_self-serve-mS-mac-address-assign.xml | 0 ...-RESOURCE-API_self-serve-mS-vlan-tag-assign.xml | 0 ...IC-RESOURCE-API_self-serve-netbox-ip-assign.xml | 0 .../GENERIC-RESOURCE-API_self-serve-pnf-assign.xml | 0 ...C-RESOURCE-API_self-serve-pnf-generate-name.xml | 0 ...C-RESOURCE-API_self-serve-pnf-ra-assignment.xml | 0 ...ENERIC-RESOURCE-API_self-serve-pnf-unassign.xml | 0 ...-serve-process-vfmodule-mapping-ra-response.xml | 0 ...serve-process-vfmodule-template-ra-response.xml | 0 ..._self-serve-process-vnf-mapping-ra-response.xml | 0 ...self-serve-process-vnf-template-ra-response.xml | 0 ...CE-API_self-serve-unresolved-composite-data.xml | 0 ...IC-RESOURCE-API_self-serve-vf-module-assign.xml | 0 ...URCE-API_self-serve-vf-module-forking-logic.xml | 0 ...-serve-vf-module-generate-name-changeassign.xml | 0 ...URCE-API_self-serve-vf-module-generate-name.xml | 0 ...RESOURCE-API_self-serve-vf-module-mdsal-put.xml | 0 ...-RESOURCE-API_self-serve-vf-module-unassign.xml | 0 ...SOURCE-API_self-serve-vfmodule-changeassign.xml | 0 ...OURCE-API_self-serve-vfmodule-ra-assignment.xml | 0 .../GENERIC-RESOURCE-API_self-serve-vnf-assign.xml | 0 ...IC-RESOURCE-API_self-serve-vnf-changeassign.xml | 0 ...C-RESOURCE-API_self-serve-vnf-forking-logic.xml | 0 ...I_self-serve-vnf-generate-name-changeassign.xml | 0 ...C-RESOURCE-API_self-serve-vnf-generate-name.xml | 0 ...NERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml | 0 ...C-RESOURCE-API_self-serve-vnf-ra-assignment.xml | 0 ...ENERIC-RESOURCE-API_self-serve-vnf-unassign.xml | 0 .../GENERIC-RESOURCE-API_send-so-response.xml | 0 ...OURCE-API_service-topology-operation-assign.xml | 0 ...API_service-topology-operation-changeassign.xml | 0 ...E-API_service-topology-operation-deactivate.xml | 0 ...OURCE-API_service-topology-operation-delete.xml | 0 ...RIC-RESOURCE-API_service-topology-operation.xml | 0 ...API_tunnelxconn-topology-operation-activate.xml | 0 ...E-API_tunnelxconn-topology-operation-assign.xml | 0 ...E-API_tunnelxconn-topology-operation-create.xml | 0 ...I_tunnelxconn-topology-operation-deactivate.xml | 0 ...E-API_tunnelxconn-topology-operation-delete.xml | 0 ...API_tunnelxconn-topology-operation-unassign.xml | 0 ...RESOURCE-API_tunnelxconn-topology-operation.xml | 0 ...OURCE-API_validate-api-contrail-route-input.xml | 0 ...E-API_validate-bbs-network-input-parameters.xml | 0 ...OURCE-API_validate-bbs-vnf-input-parameters.xml | 0 .../GENERIC-RESOURCE-API_validate-brg-input.xml | 0 ...CE-API_validate-connection-attachment-input.xml | 0 ...-RESOURCE-API_validate-contrail-route-input.xml | 0 ...CE-API_validate-generic-configuration-input.xml | 0 ...-RESOURCE-API_validate-getpathsegment-input.xml | 0 ...OURCE-API_validate-network-input-parameters.xml | 0 ...GENERIC-RESOURCE-API_validate-network-input.xml | 0 ...I_validate-overlay-network-input-parameters.xml | 0 .../GENERIC-RESOURCE-API_validate-pnf-input.xml | 0 ...C-RESOURCE-API_validate-security-zone-input.xml | 0 ...GENERIC-RESOURCE-API_validate-service-input.xml | 0 ...RIC-RESOURCE-API_validate-tunnelxconn-input.xml | 0 ...NERIC-RESOURCE-API_validate-vf-module-input.xml | 0 .../GENERIC-RESOURCE-API_validate-vnf-input.xml | 0 ...URCE-API_vf-module-generate-heat-parameters.xml | 0 ...URCE-API_vf-module-topology-assign-rollback.xml | 0 ...E-API_vf-module-topology-operation-activate.xml | 0 ...I_vf-module-topology-operation-assign-async.xml | 0 ...module-topology-operation-assign-no-preload.xml | 0 ...vf-module-topology-operation-assign-preload.xml | 0 ...PI_vf-module-topology-operation-assign-sync.xml | 0 ...RCE-API_vf-module-topology-operation-assign.xml | 0 ...URCE-API_vf-module-topology-operation-async.xml | 0 ...I_vf-module-topology-operation-changeassign.xml | 0 ...API_vf-module-topology-operation-deactivate.xml | 0 ...E-API_vf-module-topology-operation-unassign.xml | 0 ...C-RESOURCE-API_vf-module-topology-operation.xml | 0 ...PI_vf-module-topology-vlan-tagging-activate.xml | 0 ...-API_vf-module-topology-vlan-tagging-assign.xml | 0 ..._vf-module-topology-vlan-tagging-deactivate.xml | 0 ...f-module-topology-vlan-tagging-ip-addresses.xml | 0 ...NERIC-RESOURCE-API_vnf-get-resource-request.xml | 0 ...ESOURCE-API_vnf-topology-operation-activate.xml | 0 ...RCE-API_vnf-topology-operation-assign-async.xml | 0 ...URCE-API_vnf-topology-operation-assign-sync.xml | 0 ...-RESOURCE-API_vnf-topology-operation-assign.xml | 0 ...C-RESOURCE-API_vnf-topology-operation-async.xml | 0 ...RCE-API_vnf-topology-operation-changeassign.xml | 0 ...OURCE-API_vnf-topology-operation-deactivate.xml | 0 ...ESOURCE-API_vnf-topology-operation-unassign.xml | 0 ...GENERIC-RESOURCE-API_vnf-topology-operation.xml | 0 ..._wan-connection-topology-operation-activate.xml | 0 ...PI_wan-connection-topology-operation-create.xml | 0 ...an-connection-topology-operation-deactivate.xml | 0 ...PI_wan-connection-topology-operation-delete.xml | 0 .../SUBNET-API_managed-network-notification.xml | 0 .../SUBNET-API_subnet-allocated-notification.xml | 0 .../src/test/resources/svclogic/graph.versions | 0 .../gra-app}/src/test/resources/testing.http | 0 .../src/test/resources/vf-module-assign-rpc.json | 0 .../src/test/resources/vf-module-unassign-rpc.json | 0 .../src/test/resources/vnf-assign-rpc.json | 0 .../gra-app}/src/test/resources/vnf-data.json | 0 .../vnf-get-resource-request-expected.json | 0 .../resources/vnf-get-resource-request-rpc.json | 0 .../src/test/resources/vnf-level-oper-status.json | 0 .../src/test/resources/vnf-onap-model-info.json | 0 .../resources/vnf-vnf-networks-network-role.json | 0 .../src/test/resources/vnf-vnf-networks.json | 0 .../gra-docker}/pom.xml | 389 +++------------------ .../gra-docker}/src/main/dc/docker-compose.yaml | 0 .../gra-docker}/src/main/docker/Dockerfile | 7 +- .../src/main/resources/application.properties | 24 ++ .../gra-docker}/src/main/resources/data-demo.sql | 0 .../gra-docker/src/main/resources/dblib.properties | 38 ++ .../resources/generic-resource-api-dg.properties | 77 ++++ .../src/main/resources/log4j2.properties | 163 +++++++++ .../src/main/resources/org.onap.sdnc.cred.props | 0 .../src/main/resources/org.onap.sdnc.keyfile | 0 .../src/main/resources/org.onap.sdnc.p12 | Bin .../src/main/resources/org.onap.sdnc.props | 0 .../src/main/resources/org.onap.sdnc.trust.jks | Bin .../gra-docker}/src/main/resources/schema-demo.sql | 0 ms/gra/gra-docker/src/main/resources/startGra.sh | 42 +++ .../src/main/resources/svclogic.properties | 29 ++ .../src/main/resources/truststoreONAPall.jks | Bin ms/gra/pom.xml | 54 +++ ms/pom.xml | 2 +- 329 files changed, 811 insertions(+), 418 deletions(-) delete mode 100644 ms/generic-resource-api/src/main/resources/startGra.sh rename ms/{generic-resource-api => gra/gra-app}/.swagger-codegen-ignore (100%) rename ms/{generic-resource-api => gra/gra-app}/generic-resource-api-springboot.iml (100%) create mode 100644 ms/gra/gra-app/pom.xml rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/FilterConfiguration.java (88%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsApp.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiController.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationalApiController.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ServiceDataHelper.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResources.java (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResourcesRepository.java (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworks.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworksRepository.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurations.java (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurationsRepository.java (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadData.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadDataRepository.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServices.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServicesRepository.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModules.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModulesRepository.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfs.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfsRepository.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/NetworksKey.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResources.java (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResourcesRepository.java (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurations.java (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurationsRepository.java (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadData.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadDataRepository.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServices.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServicesRepository.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/PreloadDataKey.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/VfModulesKey.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/java/org/onap/sdnc/apps/ms/gra/data/VnfsKey.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/resources/application.properties (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/resources/db/changelog/db.changelog-master.yaml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/resources/dblib.properties (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/resources/generic-resource-api-dg.properties (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/resources/log4j2.properties (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/resources/svclogic.properties (100%) rename ms/{generic-resource-api => gra/gra-app}/src/main/templates/api.mustache (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsIT.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiServicesControllerTest.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiControllerTest.java (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/GR_API.http (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/allotted-resource-item.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/application.properties (92%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/contrail-route-allotted-resource-1.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/db/changelog/db.changelog-master.yaml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/dblib.properties (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/generic-resource-api-dg.properties (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/network-assign-rpc.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/policy-update-notify-rpc.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/port-mirror-assign-rpc.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/port-mirror-configuration-1.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/port-mirror-configuration-item.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/preload1-net-list-item.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/preload1-net-model-info.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/preload1-net-preload-data.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/preload1-rpc-network.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/preload1-rpc-vfmodule.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/preload2-net-list-item.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/preload2-net-model-info.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/preload2.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/service-assign-rpc.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/service1-service.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/service1-service_vnf.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/service1-servicedata.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/service1-serviceitem.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/service1-servicestatus.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/service1-vfmodule-item.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/service1.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/service9.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic.properties (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_aai-get-aic-zone.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_aai-get-network-instance-group.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-activate.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-create.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-deactivate.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-delete.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_assign-vlan-tags.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_auto-ip-assignment.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-common-huawei.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-create.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_connection-attachment-topology-operation.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-activate.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-create.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-deactivate.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-delete.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-unassign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_create-l3-subnet.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_create-route-target-and-vpn-binding.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-allocate-generic-subnet.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-create-generic-pool.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-create-network-role-pool.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-FQPN.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-allottedresource-id.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-host-routes-host-route-id.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-l3network-network-id.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-panorama-name.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-subnets-subnet-id.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-unique-name.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-vpn-binding-id.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-activate.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-assign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-deactivate.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-unassign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-topology-operation.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-complex-resource-service-model.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-data-from-policy.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-composite-match-pair.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-create-composite-path.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-create-simple-path.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-populate-from-grapi.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-populate-from-vnfapi.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-simple-match-pair.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-topology-operation-create.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-topology-operation.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_gw-vfmodule-update.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_manage-ipaddr-assignment.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_manage-vni-assignment.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_naming-policy-generate-name.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_naming-policy-generate-unique-name.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-activate.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-automated.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-vlantagging-instancegroup.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-changeassign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-create.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-deactivate.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-delete.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-unassign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-activate.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-deactivate.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-manager-create-policy.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-manager-delete-policy.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-update-notify-operation.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-get-policy.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-rollback-capacity-db.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-activate-async.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-activate-sync.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-async.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-sync.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-async.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-create-vnfcs.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-deactivate-async.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-deactivate-sync.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-disable.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-enable.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-mapping-pprobe.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-mapping-vprobe.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-unassign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-validation.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_preload-network-topology-operation.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_preload-vf-module-topology-operation.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_process-eipam-pools.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_process-generic-eipam-pools.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_query-aai-l3-network-by-network-role.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_rollback-eipam-ip-assignment.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_rollback-generated-names.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-activate.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-assign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-create.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-deactivate.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-delete.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-unassign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-pnf-put.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-generate-name.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-mS-mac-address-assign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-mS-vlan-tag-assign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-assign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-unassign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-unresolved-composite-data.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-unassign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-forking-logic.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_send-so-response.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-assign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-changeassign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-deactivate.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-delete.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-api-contrail-route-input.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-bbs-vnf-input-parameters.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-brg-input.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-connection-attachment-input.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-contrail-route-input.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-generic-configuration-input.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-getpathsegment-input.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-network-input-parameters.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-network-input.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-pnf-input.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-security-zone-input.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-service-input.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-vf-module-input.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-vnf-input.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-generate-heat-parameters.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-assign-rollback.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-no-preload.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-preload.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-changeassign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-deactivate.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-unassign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-activate.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-assign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-deactivate.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-ip-addresses.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-get-resource-request.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-activate.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign-sync.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-changeassign.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-deactivate.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-create.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-deactivate.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-delete.xml (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/SUBNET-API_managed-network-notification.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/SUBNET-API_subnet-allocated-notification.xml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/svclogic/graph.versions (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/testing.http (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/vf-module-assign-rpc.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/vf-module-unassign-rpc.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/vnf-assign-rpc.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/vnf-data.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/vnf-get-resource-request-expected.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/vnf-get-resource-request-rpc.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/vnf-level-oper-status.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/vnf-onap-model-info.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/vnf-vnf-networks-network-role.json (100%) rename ms/{generic-resource-api => gra/gra-app}/src/test/resources/vnf-vnf-networks.json (100%) rename ms/{generic-resource-api => gra/gra-docker}/pom.xml (50%) rename ms/{generic-resource-api => gra/gra-docker}/src/main/dc/docker-compose.yaml (100%) mode change 100755 => 100644 rename ms/{generic-resource-api => gra/gra-docker}/src/main/docker/Dockerfile (77%) create mode 100644 ms/gra/gra-docker/src/main/resources/application.properties rename ms/{generic-resource-api => gra/gra-docker}/src/main/resources/data-demo.sql (100%) create mode 100644 ms/gra/gra-docker/src/main/resources/dblib.properties create mode 100644 ms/gra/gra-docker/src/main/resources/generic-resource-api-dg.properties create mode 100644 ms/gra/gra-docker/src/main/resources/log4j2.properties rename ms/{generic-resource-api => gra/gra-docker}/src/main/resources/org.onap.sdnc.cred.props (100%) rename ms/{generic-resource-api => gra/gra-docker}/src/main/resources/org.onap.sdnc.keyfile (100%) rename ms/{generic-resource-api => gra/gra-docker}/src/main/resources/org.onap.sdnc.p12 (100%) rename ms/{generic-resource-api => gra/gra-docker}/src/main/resources/org.onap.sdnc.props (100%) rename ms/{generic-resource-api => gra/gra-docker}/src/main/resources/org.onap.sdnc.trust.jks (100%) rename ms/{generic-resource-api => gra/gra-docker}/src/main/resources/schema-demo.sql (100%) create mode 100644 ms/gra/gra-docker/src/main/resources/startGra.sh create mode 100644 ms/gra/gra-docker/src/main/resources/svclogic.properties rename ms/{generic-resource-api => gra/gra-docker}/src/main/resources/truststoreONAPall.jks (100%) create mode 100644 ms/gra/pom.xml 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 similarity index 100% rename from ms/generic-resource-api/.swagger-codegen-ignore rename to 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 similarity index 100% rename from ms/generic-resource-api/generic-resource-api-springboot.iml rename to 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 @@ + + + 4.0.0 + + + org.onap.sdnc.apps + gra + 2.1.0-SNAPSHOT + + + org.onap.sdnc.apps + gra-app + 2.1.0-SNAPSHOT + jar + + sdnc-apps :: ms :: gra :: ${project.artifactId} + Generic Resource API application + http://wiki.onap.org + + + org.onap.sdnc.apps.ms.gra.GenericResourceMsApp + ${project.basedir}/src/main/resources/liquibase.properties + 1.11 + 1.11 + + + + + io.swagger + swagger-annotations + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-logging + + + + + org.springframework.boot + spring-boot-starter-log4j2 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + + + org.onap.aaf.authz + aaf-auth-client + ${aaf.cadi.version} + + + org.onap.aaf.authz + aaf-misc-env + ${aaf.cadi.version} + + + org.onap.aaf.authz + aaf-misc-rosetta + ${aaf.cadi.version} + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-validation + + + io.springfox + springfox-swagger2 + 2.9.2 + + + io.springfox + springfox-swagger-ui + 2.9.2 + + + org.onap.ccsdk.apps + services + ${ccsdk.apps.version} + + + org.onap.ccsdk.apps + sliboot + ${ccsdk.apps.version} + + + org.onap.ccsdk.sli.core + sli-common + ${ccsdk.sli.core.version} + + + org.onap.ccsdk.sli.core + sli-provider-base + ${ccsdk.sli.core.version} + + + org.onap.logging-analytics + logging-filter-spring + 1.6.6 + + + javax.ws.rs + javax.ws.rs-api + + + org.onap.ccsdk.sli.core + sliPluginUtils-provider + ${ccsdk.sli.core.version} + + + org.onap.ccsdk.sli.adaptors + mdsal-resource-provider + ${ccsdk.sli.adaptors.version} + + + org.onap.ccsdk.sli.adaptors.messagerouter + publisher.provider + ${ccsdk.sli.adaptors.version} + + + org.onap.ccsdk.sli.adaptors + netbox-client-provider + ${ccsdk.sli.adaptors.version} + + + org.onap.ccsdk.sli.adaptors + sql-resource-provider + ${ccsdk.sli.adaptors.version} + + + org.onap.ccsdk.sli.plugins + restapi-call-node-provider + ${ccsdk.sli.plugins.version} + + + org.onap.ccsdk.sli.plugins + properties-node-provider + ${ccsdk.sli.plugins.version} + + + + org.liquibase + liquibase-core + 4.3.0 + + + + + org.glassfish.jersey.inject + jersey-hk2 + + + com.google.code.gson + gson + + + org.apache.derby + derby + test + + + + org.junit.platform + junit-platform-launcher + 1.6.2 + test + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + + get-gra-yaml + initialize + + copy + + + + + org.onap.sdnc.northbound + generic-resource-api-model-swagger + ${sdnc.northbound.version} + yaml + ${project.build.directory}/yaml + generic-resource.yaml + + + + + + + unpack dgs + generate-sources + + unpack + + + ${basedir}/target + + + org.onap.sdnc.oam + platform-logic-installer + ${sdnc.oam.version} + zip + + + + + + + + io.swagger + swagger-codegen-maven-plugin + 2.3.1 + + + generate-sources + + generate + + + target/generated-sources + ${project.build.directory}/yaml/generic-resource.yaml + spring + org.onap.sdnc.apps.ms.gra.swagger + org.onap.sdnc.apps.ms.gra.swagger.model + org.onap.sdnc.apps.ms.gra.swagger + true + true + ${project.basedir}/.swagger-codegen-ignore + true + ${project.basedir}/src/main/templates + + true + 2.2.4-RELEASE + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + addSource + generate-sources + + add-source + + + + ${project.basedir}/target/generated-sources/src/main/java + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + + ${basedir}/src/test/resources + ${basedir}/src/test/resources/svclogic.properties + ${gratest.mysql.database} + ${gratest.mysql.user} + ${gratest.mysql.password} + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + true + + + + + 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 similarity index 88% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/FilterConfiguration.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsApp.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiController.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationalApiController.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/ServiceDataHelper.java rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResources.java rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResourcesRepository.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworks.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworksRepository.java rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurations.java rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurationsRepository.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadData.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadDataRepository.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServices.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServicesRepository.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModules.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModulesRepository.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfs.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfsRepository.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/NetworksKey.java rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResources.java rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResourcesRepository.java rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurations.java rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurationsRepository.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadData.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPreloadDataRepository.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServices.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServicesRepository.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/PreloadDataKey.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/VfModulesKey.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/data/VnfsKey.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/resources/application.properties rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/resources/db/changelog/db.changelog-master.yaml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/resources/dblib.properties rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/resources/generic-resource-api-dg.properties rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/resources/log4j2.properties rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/resources/svclogic.properties rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/templates/api.mustache rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/GenericResourceMsIT.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiServicesControllerTest.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiControllerTest.java rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/GR_API.http rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/allotted-resource-item.json rename to 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 similarity index 92% rename from ms/generic-resource-api/src/test/resources/application.properties rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/contrail-route-allotted-resource-1.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/db/changelog/db.changelog-master.yaml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/dblib.properties rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/generic-resource-api-dg.properties rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/network-assign-rpc.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/policy-update-notify-rpc.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/port-mirror-assign-rpc.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/port-mirror-configuration-1.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/port-mirror-configuration-item.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/preload1-net-list-item.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/preload1-net-model-info.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/preload1-net-preload-data.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/preload1-rpc-network.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/preload1-rpc-vfmodule.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/preload2-net-list-item.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/preload2-net-model-info.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/preload2.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/service-assign-rpc.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/service1-service.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/service1-service_vnf.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/service1-servicedata.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/service1-serviceitem.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/service1-servicestatus.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/service1-vfmodule-item.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/service1.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/service9.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic.properties rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_aai-get-aic-zone.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_aai-get-network-instance-group.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-activate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-create.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-deactivate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_api-contrail-route-topology-operation-delete.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_assign-vlan-tags.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_auto-ip-assignment.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-create-huawei.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-common-huawei.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-create.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_brg-topology-operation.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_connection-attachment-topology-operation.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-activate.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-assign.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-create.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-deactivate.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-delete.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation-unassign.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_contrail-route-topology-operation.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_create-l3-subnet.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_create-route-target-and-vpn-binding.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-allocate-generic-subnet.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-create-generic-pool.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_eipam-create-network-role-pool.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-FQPN.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-allottedresource-id.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-host-routes-host-route-id.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-l3network-network-id.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-panorama-name.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-subnets-subnet-id.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-unique-name.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generate-vpn-binding-id.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-activate.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-assign.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-deactivate.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification-unassign.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-notification.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_generic-configuration-topology-operation.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-complex-resource-service-model.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-data-from-policy.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-composite-match-pair.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-create-composite-path.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-create-simple-path.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-populate-from-grapi.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-populate-from-vnfapi.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-simple-match-pair.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-topology-operation-create.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_getpathsegment-topology-operation.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_gw-vfmodule-update.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_manage-ipaddr-assignment.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_manage-vni-assignment.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_naming-policy-generate-name.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_naming-policy-generate-unique-name.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-activate.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-automated.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign-vlantagging-instancegroup.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-assign.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-changeassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-create.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-deactivate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-delete.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation-unassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_network-topology-operation.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-activate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-deactivate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_pnf-topology-operation.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-manager-create-policy.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-manager-delete-policy.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_policy-update-notify-operation.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-get-policy.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-rollback-capacity-db.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-activate-async.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-activate-sync.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-async.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-assign-sync.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-async.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-create-vnfcs.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-deactivate-async.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-deactivate-sync.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-disable.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-enable.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-mapping-pprobe.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-mapping-vprobe.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-unassign.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation-validation.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_port-mirror-topology-operation.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_preload-network-topology-operation.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_preload-vf-module-topology-operation.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_process-eipam-pools.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_process-generic-eipam-pools.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_query-aai-l3-network-by-network-role.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_rollback-eipam-ip-assignment.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_rollback-generated-names.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-activate.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-assign.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-create.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-deactivate.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-delete.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation-unassign.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_security-zone-topology-operation.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-pnf-put.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-vf-module-put.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-generate-name.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-mS-mac-address-assign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-mS-vlan-tag-assign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-assign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-pnf-unassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-unresolved-composite-data.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-forking-logic.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vf-module-unassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-forking-logic.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_send-so-response.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-assign.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-changeassign.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-deactivate.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation-delete.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_service-topology-operation.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_tunnelxconn-topology-operation.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-api-contrail-route-input.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-bbs-network-input-parameters.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-bbs-vnf-input-parameters.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-brg-input.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-connection-attachment-input.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-contrail-route-input.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-generic-configuration-input.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-getpathsegment-input.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-network-input-parameters.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-network-input.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-pnf-input.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-security-zone-input.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-service-input.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-vf-module-input.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_validate-vnf-input.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-generate-heat-parameters.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-assign-rollback.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-no-preload.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-preload.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-changeassign.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-deactivate.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation-unassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-operation.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-activate.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-assign.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-deactivate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vf-module-topology-vlan-tagging-ip-addresses.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-get-resource-request.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-activate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign-sync.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-changeassign.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-deactivate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_vnf-topology-operation.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-create.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-deactivate.xml rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/GENERIC-RESOURCE-API_wan-connection-topology-operation-delete.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/SUBNET-API_managed-network-notification.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/SUBNET-API_subnet-allocated-notification.xml rename to 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 old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/test/resources/svclogic/graph.versions rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/testing.http rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/vf-module-assign-rpc.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/vf-module-unassign-rpc.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/vnf-assign-rpc.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/vnf-data.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/vnf-get-resource-request-expected.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/vnf-get-resource-request-rpc.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/vnf-level-oper-status.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/vnf-onap-model-info.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/vnf-vnf-networks-network-role.json rename to 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 similarity index 100% rename from ms/generic-resource-api/src/test/resources/vnf-vnf-networks.json rename to 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 similarity index 50% rename from ms/generic-resource-api/pom.xml rename to 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,362 +4,60 @@ org.onap.sdnc.apps - sdnc-apps-ms + gra 2.1.0-SNAPSHOT org.onap.sdnc.apps - generic-resource-api + gra-docker 2.1.0-SNAPSHOT jar - sdnc-apps :: ms :: ${project.artifactId} - POM to be used for yang2swagger generation of client in SDNC project + sdnc-apps :: ms :: gra :: ${project.artifactId} + Generic Resource API docker creation http://wiki.onap.org - org.onap.sdnc.apps.ms.gra.GenericResourceMsApp - 2.1.21 - 1.2.0-SNAPSHOT - 1.1-STAGING-latest - 2.2.0-SNAPSHOT - 2.2.0-SNAPSHOT - onap/ccsdk-alpine-j11-image onap/sdnc-gra-image ${project.version} ${maven.build.timestamp} yyyyMMdd'T'HHmmss'Z' - ${project.artifactId}-${project.version}.jar + gra-app-${project.version}.jar + truststoreONAPall.jks deploy - true - testdb - itsASecret - testdb - test123 true - ${project.basedir}/src/main/resources/liquibase.properties - - 1.11 - 1.11 - io.swagger - swagger-annotations - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-logging - - - - - org.springframework.boot - spring-boot-starter-log4j2 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - - - org.onap.aaf.authz - aaf-auth-client - ${aaf.cadi.version} - - - org.onap.aaf.authz - aaf-misc-env - ${aaf.cadi.version} - - - org.onap.aaf.authz - aaf-misc-rosetta - ${aaf.cadi.version} - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-validation - - - io.springfox - springfox-swagger2 - 2.9.2 - - - io.springfox - springfox-swagger-ui - 2.9.2 - - - org.onap.ccsdk.apps - services - ${ccsdk.apps.version} - - - org.onap.ccsdk.apps - sliboot - ${ccsdk.apps.version} - - - org.onap.ccsdk.sli.core - sli-common - ${ccsdk.sli.core.version} - - - org.onap.ccsdk.sli.core - sli-provider-base - ${ccsdk.sli.core.version} - - - org.onap.logging-analytics - logging-filter-spring - 1.6.6 - - - javax.ws.rs - javax.ws.rs-api - - - org.onap.ccsdk.sli.core - sliPluginUtils-provider - ${ccsdk.sli.core.version} - - - org.onap.ccsdk.sli.adaptors - mdsal-resource-provider - ${ccsdk.sli.adaptors.version} - - - org.onap.ccsdk.sli.adaptors.messagerouter - publisher.provider - ${ccsdk.sli.adaptors.version} - - - org.onap.ccsdk.sli.adaptors - netbox-client-provider - ${ccsdk.sli.adaptors.version} - - - org.onap.ccsdk.sli.adaptors - sql-resource-provider - ${ccsdk.sli.adaptors.version} - - - org.onap.ccsdk.sli.plugins - restapi-call-node-provider - ${ccsdk.sli.plugins.version} - - - org.onap.ccsdk.sli.plugins - properties-node-provider - ${ccsdk.sli.plugins.version} - - - - org.liquibase - liquibase-core - 4.3.0 - - - - - org.glassfish.jersey.inject - jersey-hk2 - - - com.google.code.gson - gson - - - org.apache.derby - derby - test - - - - org.junit.platform - junit-platform-launcher - 1.6.2 - test + ${project.groupId} + gra-app + ${project.version} - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - ${basedir}/../../TagVersion.groovy - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - - get-gra-yaml - initialize - - copy - - - - - org.onap.sdnc.northbound - generic-resource-api-model-swagger - ${sdnc.northbound.version} - yaml - ${project.build.directory}/yaml - generic-resource.yaml - - - - - - - unpack dgs - generate-sources - - unpack - - - ${basedir}/target/docker-stage/opt/onap/sdnc - - - org.onap.sdnc.oam - platform-logic-installer - ${sdnc.oam.version} - zip - - - - - - - - io.swagger - swagger-codegen-maven-plugin - 2.3.1 - - - generate-sources - - generate - - - target/generated-sources - ${project.build.directory}/yaml/generic-resource.yaml - spring - org.onap.sdnc.apps.ms.gra.swagger - org.onap.sdnc.apps.ms.gra.swagger.model - org.onap.sdnc.apps.ms.gra.swagger - true - true - ${project.basedir}/.swagger-codegen-ignore - true - ${project.basedir}/src/main/templates - - true - 2.2.4-RELEASE - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.0.0 - - - addSource - generate-sources - - add-source - - - - ${project.basedir}/target/generated-sources/src/main/java - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - - ${basedir}/src/test/resources - ${basedir}/src/test/resources/svclogic.properties - ${gratest.mysql.database} - ${gratest.mysql.user} - ${gratest.mysql.password} - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - true - - - - docker + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + ${basedir}/../../../TagVersion.groovy + + + + org.apache.maven.plugins maven-dependency-plugin @@ -383,8 +81,27 @@ false + + unpack dgs + generate-sources + + unpack + + + ${basedir}/target/docker-stage/opt/onap/sdnc + + + org.onap.sdnc.oam + platform-logic-installer + ${sdnc.oam.version} + zip + + + + + maven-resources-plugin 2.6 @@ -430,39 +147,39 @@ - copy-script + copy-jks copy-resources generate-resources - ${basedir}/target/docker-stage/opt/onap/sdnc/bin + ${basedir}/target/docker-stage/opt/onap/sdnc/config src/main/resources - *.sh + *.jks - true + false - copy-jar + copy-script copy-resources - package + generate-resources - ${basedir}/target/docker-stage/opt/onap/sdnc/lib + ${basedir}/target/docker-stage/opt/onap/sdnc/bin - ${basedir}/target + src/main/resources - ${sdnc.gra.jar} + *.sh - false + true diff --git a/ms/generic-resource-api/src/main/dc/docker-compose.yaml b/ms/gra/gra-docker/src/main/dc/docker-compose.yaml old mode 100755 new mode 100644 similarity index 100% rename from ms/generic-resource-api/src/main/dc/docker-compose.yaml rename to 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 similarity index 77% rename from ms/generic-resource-api/src/main/docker/Dockerfile rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/resources/data-demo.sql rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/resources/org.onap.sdnc.cred.props rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/resources/org.onap.sdnc.keyfile rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/resources/org.onap.sdnc.p12 rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/resources/org.onap.sdnc.props rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/resources/org.onap.sdnc.trust.jks rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/resources/schema-demo.sql rename to 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 similarity index 100% rename from ms/generic-resource-api/src/main/resources/truststoreONAPall.jks rename to 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 @@ + + + + + 4.0.0 + + + org.onap.sdnc.apps + sdnc-apps-ms + 2.1.0-SNAPSHOT + + + gra + 2.1.0-SNAPSHOT + pom + + sdnc-apps :: ms :: ${project.artifactId} + Generic Resource API microservice + + + 2.1.21 + 1.2.0-SNAPSHOT + 1.1-STAGING-latest + 2.2.0-SNAPSHOT + 2.2.0-SNAPSHOT + testdb + itsASecret + testdb + test123 + + + + gra-app + gra-docker + + 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 @@ Micro-services - generic-resource-api + gra -- 2.16.6