4 files changed, 58 insertions, 1 deletions
diff --git a/asdc-controller/src/test/resources/resource-examples/ccvpn/demo-ccvpn-notification.json b/asdc-controller/src/test/resources/resource-examples/ccvpn/demo-ccvpn-notification.json
new file mode 100644
index 0000000000..1ca96f7dc9
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/ccvpn/demo-ccvpn-notification.json
@@ -0,0 +1,47 @@
+{
+  "distributionID": "8a01603d-606d-4e40-8bc4-37107ad97897",
+  "serviceName": "CCVPNService",
+  "serviceVersion": "1.0",
+  "serviceUUID": "317887d3-a4e4-45cb-8971-2a78426fefac",
+  "serviceDescription": "CCVPN",
+  "serviceInvariantUUID": "e43f9b81-3035-44df-b618-a787e1c49427",
+  "resources": [
+    {
+      "resourceInstanceName": "siteResource",
+      "resourceCustomizationUUID": "e9e01777-bb2f-42f0-b825-aef0f4c37ccf",
+      "resourceName": "siteResource",
+      "resourceVersion": "1.0",
+      "resoucreType": "VF",
+      "resourceUUID": "5a641276-443b-45ca-ac9c-a0ee84f5007b",
+      "resourceInvariantUUID": "5338673f-df81-483a-afa4-b9766442ebf1",
+      "category": "Configuration",
+      "subcategory": "Configuration",
+      "artifacts": []
+    },
+    {
+      "resourceInstanceName": "SDWANVPNResource",
+      "resourceCustomizationUUID": "7815f32c-bdbf-41f7-9a18-6f0e6d5a0d0e",
+      "resourceName": "SDWANVPNResource",
+      "resourceVersion": "1.0",
+      "resoucreType": "VF",
+      "resourceUUID": "5f9f2164-f7e4-461d-b8de-3470297ce2b3",
+      "resourceInvariantUUID": "5ca15886-9990-419c-a4bb-f0229eac0926",
+      "category": "Configuration",
+      "subcategory": "Configuration",
+      "artifacts": []
+    }
+  ],
+  "serviceArtifacts": [
+    {
+      "artifactName": "service-Ccvpnservice-csar.csar",
+      "artifactType": "TOSCA_CSAR",
+      "artifactURL": "/service-Ccvpnservice-csar.csar",
+      "artifactChecksum": "NTZlNGU4YTQwNzVkZWMwYWZkODE5M2MwYzcyNzM3M2U\u003d",
+      "artifactDescription": "TOSCA definition package of the asset",
+      "artifactTimeout": 0,
+      "artifactVersion": "2",
+      "artifactUUID": "59f34dcf-ec33-4a88-8dbe-aa7f4571ef59"
+    }
+  ],
+  "workloadContext": "Production"
+}
+\ No newline at end of file
diff --git a/asdc-controller/src/test/resources/resource-examples/ccvpn/service-Ccvpnservice-csar.csar b/asdc-controller/src/test/resources/resource-examples/ccvpn/service-Ccvpnservice-csar.csar
new file mode 100644
index 0000000000..ce2ac5e0c9
--- /dev/null
+++ b/asdc-controller/src/test/resources/resource-examples/ccvpn/service-Ccvpnservice-csar.csar
diff --git a/asdc-controller/src/test/resources/resource-examples/vcpe-infra/service-Demovcpeinfra-csar.csar b/asdc-controller/src/test/resources/resource-examples/vcpe-infra/service-Demovcpeinfra-csar.csar
index 841c681088..40b8b7b45a 100644
--- a/asdc-controller/src/test/resources/resource-examples/vcpe-infra/service-Demovcpeinfra-csar.csar
+++ b/asdc-controller/src/test/resources/resource-examples/vcpe-infra/service-Demovcpeinfra-csar.csar
diff --git a/asdc-controller/src/test/resources/schema.sql b/asdc-controller/src/test/resources/schema.sql
index 8cc5ee9d49..ad6b156956 100644
--- a/asdc-controller/src/test/resources/schema.sql
+++ b/asdc-controller/src/test/resources/schema.sql
@@ -806,6 +806,9 @@ CREATE TABLE `service` (
   `WORKLOAD_CONTEXT` varchar(200) DEFAULT NULL,
   `SERVICE_CATEGORY` varchar(200) DEFAULT NULL,
   `RESOURCE_ORDER` varchar(200) default NULL,
+  `OVERALL_DISTRIBUTION_STATUS` varchar(45),
+  `ONAP_GENERATED_NAMING` TINYINT(1) DEFAULT NULL,
+  `NAMING_POLICY` varchar(200) DEFAULT NULL,
   PRIMARY KEY (`MODEL_UUID`),
   KEY `fk_service__tosca_csar1_idx` (`TOSCA_CSAR_ARTIFACT_UUID`),
   CONSTRAINT `fk_service__tosca_csar1` FOREIGN KEY (`TOSCA_CSAR_ARTIFACT_UUID`) REFERENCES `tosca_csar` (`ARTIFACT_UUID`) ON DELETE CASCADE ON UPDATE CASCADE
@@ -1109,6 +1112,8 @@ CREATE TABLE `vnf_resource_customization` (
   `CREATION_TIMESTAMP` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `VNF_RESOURCE_MODEL_UUID` varchar(200) NOT NULL,
   `SERVICE_MODEL_UUID` varchar(200) NOT NULL,
+  `VNFCINSTANCEGROUP_ORDER` varchar(200) default NULL,
+  `NF_DATA_VALID` tinyint(1) DEFAULT '0',  
   PRIMARY KEY (`ID`),
   UNIQUE KEY `UK_vnf_resource_customization` (`MODEL_CUSTOMIZATION_UUID`,`SERVICE_MODEL_UUID`),
   KEY `fk_vnf_resource_customization__vnf_resource1_idx` (`VNF_RESOURCE_MODEL_UUID`),
@@ -1135,6 +1140,8 @@ CREATE TABLE `vnfc_customization` (
   `MODEL_NAME` varchar(200) NOT NULL,
   `TOSCA_NODE_TYPE` varchar(200) NOT NULL,
   `DESCRIPTION` varchar(1200) DEFAULT NULL,
+  `RESOURCE_INPUT` varchar(20000) DEFAULT NULL,
+  `VNFC_INSTANCE_GROUP_CUSTOMIZATION_ID` integer DEFAULT NULL,
   `CREATION_TIMESTAMP` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`MODEL_CUSTOMIZATION_UUID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -1455,7 +1462,10 @@ CREATE TABLE `infra_active_requests` (
   `CONFIGURATION_NAME` varchar(200) DEFAULT NULL,
   `OPERATIONAL_ENV_ID` varchar(45) DEFAULT NULL,
   `OPERATIONAL_ENV_NAME` varchar(200) DEFAULT NULL,
-  `REQUEST_URL` varchar(500) DEFAULT NULL,  
+  `REQUEST_URL` varchar(500) DEFAULT NULL,
+  `ORIGINAL_REQUEST_ID` varchar(45) DEFAULT NULL,
+  `EXT_SYSTEM_ERROR_SOURCE` varchar(80) DEFAULT NULL,
+  `ROLLBACK_EXT_SYSTEM_ERROR_SOURCE` varchar(80) DEFAULT NULL,
   PRIMARY KEY (`REQUEST_ID`),
   UNIQUE KEY `UK_bhu6w8p7wvur4pin0gjw2d5ak` (`CLIENT_REQUEST_ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;