1710 Rebase - Second Attempt
This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400
Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000
Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>
diff --git a/asdc-controller/src/main/resources/resource-examples/notif-structure.json b/asdc-controller/src/main/resources/resource-examples/notif-structure.json
new file mode 100644
index 0000000..103a799
--- /dev/null
+++ b/asdc-controller/src/main/resources/resource-examples/notif-structure.json
@@ -0,0 +1,138 @@
+{
+ "serviceName": "test-service",
+ "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
+ "serviceUUID": "4be40491-e2e5-4a84-a7e5-57c83b5b95fc",
+ "serviceVersion": "2.0",
+ "serviceArtifacts":
+ [{
+ "artifactName": "service_Rg516VmmscSrvc_csar.csar",
+ "artifactType": "TOSCA_CSAR",
+ "artifactURL": "service_Rg516VmmscSrvc_csar.csar",
+ "artifactChecksum": "ZDc1MTcxMzk4ODk4N2U5MzMxOTgwMzYzZTI0MTg5Y2U\u003d",
+ "artifactDescription": "TOSCA representation of the asset",
+ "artifactTimeout": 0,
+ "artifactUUID": "123456-35a8-467f-b440-d0f6226b3516",
+ "artifactVersion": "5"
+ }
+
+ ],
+
+ "resources":
+ [
+ {
+ "resourceInstanceName": "resource-1",
+ "resourceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134",
+ "resourceCustomizationUUID": "6402d92d-0050-46a9-8202-623a46680ba7",
+ "resourceName": "resourceName-1",
+ "resourceType": "VF",
+ "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136",
+ "resourceVersion": "2.0",
+ "category": "Resource",
+ "subcategory": "Resource",
+ "artifacts":
+ [
+ {
+ "artifactChecksum": "ZDc1MTcxMzk4ODk4N2U5MzMxOTgwMzYzZTI0MTg5Y2U\u003d",
+ "artifactDescription": "Meta data for VFModule",
+ "artifactName": "vnf-module-artifact.json",
+
+ "artifactType": "VF_MODULES_METADATA",
+ "artifactURL": "vnf-module-artifact.json",
+ "artifactUUID": "VfArtifact-UUID1",
+ "artifactVersion": "1.0"
+
+ },
+ {
+ "artifactChecksum": "ZDc1MTcxMzk4ODk4N2U5MzMxOTgwMzYzZTI0MTg5Y2U\u003d",
+ "artifactDescription": "Nimbus Heat OAM",
+ "artifactName": "hot-nimbus-oam_v1.0.yaml",
+ "artifactTimeout": 100,
+ "artifactType": "HEAT_ARTIFACT",
+ "artifactURL": "hot-nimbus-oam_v1.0.yaml",
+ "artifactUUID": "Heat-Artifact-Artifact-UUID1",
+ "artifactVersion": "1.0",
+ "generatedArtifact": "EnvArtifact-Artifact-UUID1"
+
+ },
+
+ {
+ "artifactChecksum": "ZDc1MTcxMzk4ODk4N2U5MzMxOTgwMzYzZTI0MTg5Y2U\u003d",
+ "artifactDescription": "Nimbus Heat OAM Artifact",
+ "artifactName": "hot-nimbus-oam_v1.0.yaml",
+ "artifactTimeout": 100,
+ "artifactType": "HEAT",
+ "artifactURL": "hot-nimbus-oam_v1.0.yaml",
+ "artifactUUID": "Heat-Artifact-UUID1",
+ "artifactVersion": "1.0",
+ "generatedArtifact": "EnvArtifact-UUID1"
+
+ },
+
+ {
+ "artifactChecksum": "ZDc1MTcxMzk4ODk4N2U5MzMxOTgwMzYzZTI0MTg5Y2U\u003d",
+ "artifactDescription": "Nimbus Heat ENV OAM",
+ "artifactName": "hot-nimbus-oam_v1.0.env",
+
+ "artifactType": "HEAT_ENV",
+ "artifactURL": "hot-nimbus-oam_v1.0.env",
+ "artifactUUID": "EnvArtifact-UUID1",
+ "artifactVersion": "1.0"
+
+ },
+
+ {
+ "artifactChecksum": "ZDc1MTcxMzk4ODk4N2U5MzMxOTgwMzYzZTI0MTg5Y2U\u003d",
+ "artifactDescription": "Nimbus Heat OAM",
+ "artifactName": "hot-nimbus-oam_v2.0.yaml",
+ "artifactTimeout": 100,
+ "artifactType": "HEAT_ARTIFACT",
+ "artifactURL": "hot-nimbus-oam_v1.0.yaml",
+ "artifactUUID": "Heat-Artifact-Artifact-UUID2",
+ "artifactVersion": "2.0",
+ "generatedArtifact": "EnvArtifact-Artifact-UUID2"
+
+ },
+
+ {
+ "artifactChecksum": "ZDc1MTcxMzk4ODk4N2U5MzMxOTgwMzYzZTI0MTg5Y2U\u003d",
+ "artifactDescription": "Nimbus Heat OAM",
+ "artifactName": "hot-nimbus-oam_v2.0.yaml",
+ "artifactTimeout": 100,
+ "artifactType": "HEAT",
+ "artifactURL": "hot-nimbus-oam_v1.0.yaml",
+ "artifactUUID": "Heat-Artifact-UUID2",
+ "artifactVersion": "2.0",
+ "generatedArtifact": "EnvArtifact-UUID2"
+
+ },
+
+ {
+ "artifactChecksum": "ZDc1MTcxMzk4ODk4N2U5MzMxOTgwMzYzZTI0MTg5Y2U\u003d",
+ "artifactDescription": "Nimbus Heat ENV OAM",
+ "artifactName": "hot-nimbus-oam_v2.0.env",
+
+ "artifactType": "HEAT_ENV",
+ "artifactURL": "hot-nimbus-oam_v1.0.env",
+ "artifactUUID": "EnvArtifact-UUID2",
+ "artifactVersion": "2.0"
+
+ },
+
+ {
+ "artifactChecksum": "ZDc1MTcxMzk4ODk4N2U5MzMxOTgwMzYzZTI0MTg5Y2U\u003d",
+ "artifactDescription": "Nested OAM",
+ "artifactName": "nested-oam_v1.0.yaml",
+ "artifactTimeout": 10,
+ "artifactType": "HEAT_NESTED",
+ "artifactURL": "nested-oam_v1.0.yaml",
+ "artifactUUID": "NestedArtifact-UUID3",
+ "artifactVersion": "1.0"
+
+ }
+ ]
+ }
+ ],
+
+ "serviceDescription": "test service for unit testing",
+ "distributionID": "35120a87-1f82-4276-9735-f6de5a244d65"
+}
\ No newline at end of file