[MSO-8] Update the maven dependency

Update the maven depenency for sdc-distribution-client to cooperate with the sdc changes.

Change-Id: I2da936e5c40cb68c7181bb78307192dd5655b5dc
Signed-off-by: xg353y <xg353y@intl.att.com>

15 files changed, 139 insertions, 104 deletions

diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json
index 91e6ac8..9f51e83 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json
@@ -4,21 +4,27 @@
     "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
     "vfModuleModelVersion": "1.0",
     "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI1_DNS::module-1::module-1.group",
+    "vfModuleModelDescription": "vf Module Description",
+    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f132",
     "isBase": true,
     "artifacts": [
       "Artifact-UUID1",
       "EnvArtifact-UUID1"
-    ]
+    ],
+    "properties": {"test":"test"}
   },
   {
     "vfModuleModelName": "VF_RI1_DNS::module-2",
     "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f133",
     "vfModuleModelVersion": "1.0",
     "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI1_DNS::module-2::module-1.group",
+    "vfModuleModelDescription": "vf Module Description",
+    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f133",
     "isBase": false,
     "artifacts": [
       "Artifact-UUID2",
       "EnvArtifact-UUID2"
-    ]
+    ],
+    "properties": {"test":"test"}
   }
 ]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json
index 63f32cb..ebda7b7 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json
@@ -3,12 +3,12 @@
     "serviceInvariantUUID": "585822c8-4027-4f84-ba50-e9248606f111",
     "serviceUUID": "1e34774e-715e-4fd6-bd09-7b654622f35i",
     "serviceVersion": "1.0",
-    "serviceArtifacts": 
+    "serviceArtifacts":
     [
- 
+
     ],
 
-    "resources": 
+    "resources":
     [
         {
             "resourceInstanceName": "DNSResource-1",
@@ -17,13 +17,14 @@
             "resourceType": "VF",
             "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f131",
             "resourceVersion": "1.0",
-            "artifacts": 
+            "category":  "category",
+            "artifacts":
             [
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Meta data for VFModule",
                     "artifactName": "vnf-module-artifact.json",
-                    
+
                     "artifactType": "VF_MODULES_METADATA",
                     "artifactURL": "vnf-module-artifact.json",
                     "artifactUUID": "VfArtifact-UUID1",
@@ -40,9 +41,9 @@
                     "artifactUUID": "Artifact-UUID1",
                     "artifactVersion": "1.0",
                     "generatedArtifact": "EnvArtifact-UUID1",
-                    "relatedArtifact": 
+                    "relatedArtifact":
                     [
-                       
+
                     ]
                 },
 
@@ -50,12 +51,12 @@
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "BASE VLB ENV file",
                     "artifactName": "base_vlb.env",
-                    
+
                     "artifactType": "HEAT_ENV",
                     "artifactURL": "base_vlb.env",
                     "artifactUUID": "EnvArtifact-UUID1",
                     "artifactVersion": "1.0"
-                  
+
                 },
             	{
                     "artifactChecksum": "CheckSum",
@@ -67,9 +68,9 @@
                     "artifactUUID": "Artifact-UUID2",
                     "artifactVersion": "1.0",
                     "generatedArtifact": "EnvArtifact-UUID2",
-                    "relatedArtifact": 
+                    "relatedArtifact":
                     [
-                       
+
                     ]
                 },
 
@@ -77,12 +78,12 @@
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "DNS Scaling ENV file",
                     "artifactName": "dnsscaling.env",
-                    
+
                     "artifactType": "HEAT_ENV",
                     "artifactURL": "dnsscaling.env",
                     "artifactUUID": "EnvArtifact-UUID2",
                     "artifactVersion": "1.0"
-                  
+
                 }
 
             ]
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/vnf-module-artifact.json
index 5a732fc..0e45ba6 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/vnf-module-artifact.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/artifacts/vnf-module-artifact.json
@@ -4,10 +4,13 @@
     "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134",
     "vfModuleModelVersion": "1.0",
     "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group",
+    "vfModuleModelDescription": "vf Module Description",
+    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f134",
     "isBase": true,
     "artifacts": [
       "Artifact-UUID3",
       "EnvArtifact-UUID3"
-    ]
+    ],
+    "properties": {"test":"test"}
   }
 ]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/notif-structure.json
index 63ca36e..bec8bed 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/notif-structure.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-vfw-V1/notif-structure.json
@@ -3,12 +3,12 @@
     "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f112",
     "serviceUUID": "2e34774e-715e-4fd5-bd09-7b654622f35i",
     "serviceVersion": "1.0",
-    "serviceArtifacts": 
+    "serviceArtifacts":
     [
- 
+
     ],
 
-    "resources": 
+    "resources":
     [
         {
             "resourceInstanceName": "VFWResource-1",
@@ -17,13 +17,14 @@
             "resourceType": "VF",
             "resourceUUID": "685822c7-4027-4f84-ba50-e9248606f132",
             "resourceVersion": "1.0",
-            "artifacts": 
+            "category":  "category",
+            "artifacts":
             [
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Meta data for VFModule",
                     "artifactName": "vnf-module-artifact.json",
-                    
+
                     "artifactType": "VF_MODULES_METADATA",
                     "artifactURL": "vnf-module-artifact.json",
                     "artifactUUID": "VfArtifact-UUID2",
@@ -40,9 +41,9 @@
                     "artifactUUID": "Artifact-UUID3",
                     "artifactVersion": "1.0",
                     "generatedArtifact": "EnvArtifact-UUID3",
-                    "relatedArtifact": 
+                    "relatedArtifact":
                     [
-                       
+
                     ]
                 },
 
@@ -50,7 +51,7 @@
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "base_vfw ENV file",
                     "artifactName": "base_vfw.env",
-                    
+
                     "artifactType": "HEAT_ENV",
                     "artifactURL": "base_vfw.env",
                     "artifactUUID": "EnvArtifact-UUID3",
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/notif-structure.json
index 2fb12ed..622ea3c 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/notif-structure.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/notif-without-modules-metadata/notif-structure.json
@@ -3,12 +3,12 @@
     "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
     "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f33e",
     "serviceVersion": "1.0",
-    "serviceArtifacts": 
+    "serviceArtifacts":
     [
- 
+
     ],
 
-    "resources": 
+    "resources":
     [
         {
             "resourceInstanceName": "wrong-resource-1",
@@ -17,9 +17,10 @@
             "resourceType": "VF",
             "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136",
             "resourceVersion": "1.0",
-            "artifacts": 
+            "category":  "category",
+            "artifacts":
             [
-               
+
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Nimbus Heat OAM",
@@ -30,7 +31,7 @@
                     "artifactUUID": "Artifact-UUID1",
                     "artifactVersion": "1.0",
                     "generatedArtifact": "EnvArtifact-UUID2",
-                    "relatedArtifact": 
+                    "relatedArtifact":
                     [
                         "NestedArtifact-UUID3"
                     ]
@@ -45,7 +46,7 @@
                     "artifactURL": "hot-nimbus-oam_v1.0.env",
                     "artifactUUID": "EnvArtifact-UUID2",
                     "artifactVersion": "1.0"
-                  
+
                 },
 
                 {
@@ -57,7 +58,7 @@
                     "artifactURL": "nested-oam_v1.0.yaml",
                     "artifactUUID": "NestedArtifact-UUID3",
                     "artifactVersion": "1.0"
-          
+
                 }
             ]
         }
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/vnf-module-artifact.json
index f196467..29aa483 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/vnf-module-artifact.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/artifacts/vnf-module-artifact.json
@@ -4,11 +4,14 @@
     "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f131",
     "vfModuleModelVersion": "1.0",
     "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-0.group",
+    "vfModuleModelDescription": "vf Module Description",
+    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f136",
     "isBase": true,
     "artifacts": [
       "Artifact-UUID1",
       "EnvArtifact-UUID2",
       "NestedArtifact-UUID3"
-    ]
+    ] ,
+    "properties": {"test":"test"}
   }
 ]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/notif-structure.json
index 1f5e081..64b4b68 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/notif-structure.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V1/notif-structure.json
@@ -3,12 +3,12 @@
     "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
     "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f33e",
     "serviceVersion": "1.0",
-    "serviceArtifacts": 
+    "serviceArtifacts":
     [
- 
+
     ],
 
-    "resources": 
+    "resources":
     [
         {
             "resourceInstanceName": "resource-1",
@@ -17,13 +17,14 @@
             "resourceType": "VF",
             "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136",
             "resourceVersion": "1.0",
-            "artifacts": 
+            "category":  "category",
+            "artifacts":
             [
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Meta data for VFModule",
                     "artifactName": "vnf-module-artifact.json",
-                    
+
                     "artifactType": "VF_MODULES_METADATA",
                     "artifactURL": "vnf-module-artifact.json",
                     "artifactUUID": "VfArtifact-UUID1",
@@ -40,19 +41,19 @@
                     "artifactUUID": "Artifact-UUID1",
                     "artifactVersion": "1.0",
                     "generatedArtifact": "EnvArtifact-UUID2"
-                    
+
                 },
 
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Nimbus Heat ENV OAM",
                     "artifactName": "hot-nimbus-oam_v1.0.env",
-                    
+
                     "artifactType": "HEAT_ENV",
                     "artifactURL": "hot-nimbus-oam_v1.0.env",
                     "artifactUUID": "EnvArtifact-UUID2",
                     "artifactVersion": "1.0"
-                  
+
                 },
 
                 {
@@ -64,7 +65,7 @@
                     "artifactURL": "nested-oam_v1.0.yaml",
                     "artifactUUID": "NestedArtifact-UUID3",
                     "artifactVersion": "1.0"
-          
+
                 }
             ]
         }
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/vnf-module-artifact.json
index f196467..301012e 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/vnf-module-artifact.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/artifacts/vnf-module-artifact.json
@@ -4,11 +4,14 @@
     "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f131",
     "vfModuleModelVersion": "1.0",
     "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-0.group",
+    "vfModuleModelDescription": "vf Module Description",
+    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f131",
     "isBase": true,
     "artifacts": [
       "Artifact-UUID1",
       "EnvArtifact-UUID2",
       "NestedArtifact-UUID3"
-    ]
+    ],
+    "properties": {"test":"test"}
   }
 ]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/notif-structure.json
index 0b2b312..ef9f256 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/notif-structure.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V2/notif-structure.json
@@ -3,12 +3,12 @@
     "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
     "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f33f",
     "serviceVersion": "2.0",
-    "serviceArtifacts": 
+    "serviceArtifacts":
     [
- 
+
     ],
 
-    "resources": 
+    "resources":
     [
         {
             "resourceInstanceName": "resource-1",
@@ -17,13 +17,14 @@
             "resourceType": "VF",
             "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136",
             "resourceVersion": "1.0",
-            "artifacts": 
+            "category":  "category",
+            "artifacts":
             [
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Meta data for VFModule",
                     "artifactName": "vnf-module-artifact.json",
-                    
+
                     "artifactType": "VF_MODULES_METADATA",
                     "artifactURL": "vnf-module-artifact.json",
                     "artifactUUID": "VfArtifact-UUID1",
@@ -40,7 +41,7 @@
                     "artifactUUID": "Artifact-UUID1",
                     "artifactVersion": "1.0",
                     "generatedArtifact": "EnvArtifact-UUID2",
-                    "relatedArtifact": 
+                    "relatedArtifact":
                     [
                         "NestedArtifact-UUID3"
                     ]
@@ -50,12 +51,12 @@
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Nimbus Heat ENV OAM",
                     "artifactName": "hot-nimbus-oam_v1.0.env",
-                    
+
                     "artifactType": "HEAT_ENV",
                     "artifactURL": "hot-nimbus-oam_v1.0.env",
                     "artifactUUID": "EnvArtifact-UUID2",
                     "artifactVersion": "1.0"
-                  
+
                 },
 
                 {
@@ -67,7 +68,7 @@
                     "artifactURL": "nested-oam_v1.0.yaml",
                     "artifactUUID": "NestedArtifact-UUID3",
                     "artifactVersion": "1.0"
-          
+
                 }
             ]
         }
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/vnf-module-artifact.json
index 7f1051d..50fb1b7 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/vnf-module-artifact.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/artifacts/vnf-module-artifact.json
@@ -4,6 +4,8 @@
     "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
     "vfModuleModelVersion": "1.0",
     "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-1.group",
+    "vfModuleModelDescription": "vf Module Description",
+    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f132",
     "isBase": true,
     "artifacts": [
       "Artifact-UUID1",
@@ -12,6 +14,7 @@
       "ScriptArtifact-UUID1",
       "VolumeArtifact-UUID1",
       "VolumeEnvArtifact-UUID1"
-    ]
+    ],
+    "properties": {"test":"test"}
   }
 ]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/notif-structure.json
index fc017ac..c5c6f92 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/notif-structure.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V3/notif-structure.json
@@ -3,12 +3,12 @@
     "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f133",
     "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f34g",
     "serviceVersion": "3.0",
-    "serviceArtifacts": 
+    "serviceArtifacts":
     [
- 
+
     ],
 
-    "resources": 
+    "resources":
     [
         {
             "resourceInstanceName": "resource-1",
@@ -17,13 +17,14 @@
             "resourceType": "VF",
             "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136",
             "resourceVersion": "2.0",
-            "artifacts": 
+            "category":  "category",
+            "artifacts":
             [
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Meta data for VFModule",
                     "artifactName": "vnf-module-artifact.json",
-                    
+
                     "artifactType": "VF_MODULES_METADATA",
                     "artifactURL": "vnf-module-artifact.json",
                     "artifactUUID": "VfArtifact-UUID2",
@@ -40,7 +41,7 @@
                     "artifactUUID": "Artifact-UUID1",
                     "artifactVersion": "1.0",
                     "generatedArtifact": "EnvArtifact-UUID2",
-                    "relatedArtifact": 
+                    "relatedArtifact":
                     [
                         "NestedArtifact-UUID3",
                         "ScriptArtifact-UUID1"
@@ -51,12 +52,12 @@
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Nimbus Heat ENV OAM",
                     "artifactName": "hot-nimbus-oam_v1.0.env",
-                    
+
                     "artifactType": "HEAT_ENV",
                     "artifactURL": "hot-nimbus-oam_v1.0.env",
                     "artifactUUID": "EnvArtifact-UUID2",
                     "artifactVersion": "1.0"
-                  
+
                 },
 
                 {
@@ -68,19 +69,19 @@
                     "artifactURL": "nested-oam_v1.0.yaml",
                     "artifactUUID": "NestedArtifact-UUID3",
                     "artifactVersion": "1.0"
-          
+
                 },
 
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Script for OAM",
                     "artifactName": "mount_iso_script.sh",
-                    
+
                     "artifactType": "HEAT_ARTIFACT",
                     "artifactURL": "mount_iso_script.sh",
                     "artifactUUID": "ScriptArtifact-UUID1",
                     "artifactVersion": "1.0"
-          
+
                 },
 
                 {
@@ -93,19 +94,19 @@
                     "artifactUUID": "VolumeArtifact-UUID1",
                     "artifactVersion": "1.0",
                     "generatedArtifact": "VolumeEnvArtifact-UUID1"
-          
+
                 },
 
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Heat Env Vol for OAM",
                     "artifactName": "hot-nimbus-oam-volumes_v1.0.env",
-                    
+
                     "artifactType": "HEAT_ENV",
                     "artifactURL": "hot-nimbus-oam-volumes_v1.0.env",
                     "artifactUUID": "VolumeEnvArtifact-UUID1",
                     "artifactVersion": "1.0"
-          
+
                 }
             ]
         }
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/vnf-module-artifact.json
index 7f1051d..50fb1b7 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/vnf-module-artifact.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/artifacts/vnf-module-artifact.json
@@ -4,6 +4,8 @@
     "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
     "vfModuleModelVersion": "1.0",
     "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-1.group",
+    "vfModuleModelDescription": "vf Module Description",
+    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f132",
     "isBase": true,
     "artifacts": [
       "Artifact-UUID1",
@@ -12,6 +14,7 @@
       "ScriptArtifact-UUID1",
       "VolumeArtifact-UUID1",
       "VolumeEnvArtifact-UUID1"
-    ]
+    ],
+    "properties": {"test":"test"}
   }
 ]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/notif-structure.json
index ccf80ce..c4b1134 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/notif-structure.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V4/notif-structure.json
@@ -3,12 +3,12 @@
     "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134",
     "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f35h",
     "serviceVersion": "4.0",
-    "serviceArtifacts": 
+    "serviceArtifacts":
     [
- 
+
     ],
 
-    "resources": 
+    "resources":
     [
         {
             "resourceInstanceName": "resource-1",
@@ -17,13 +17,14 @@
             "resourceType": "VF",
             "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136",
             "resourceVersion": "2.0",
-            "artifacts": 
+            "category":  "category",
+            "artifacts":
             [
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Meta data for VFModule",
                     "artifactName": "vnf-module-artifact.json",
-                    
+
                     "artifactType": "VF_MODULES_METADATA",
                     "artifactURL": "vnf-module-artifact.json",
                     "artifactUUID": "VfArtifact-UUID2",
@@ -40,7 +41,7 @@
                     "artifactUUID": "Artifact-UUID1",
                     "artifactVersion": "1.0",
                     "generatedArtifact": "EnvArtifact-UUID2",
-                    "relatedArtifact": 
+                    "relatedArtifact":
                     [
                         "NestedArtifact-UUID3",
                         "ScriptArtifact-UUID1"
@@ -51,12 +52,12 @@
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Nimbus Heat ENV OAM",
                     "artifactName": "hot-nimbus-oam_v1.0.env",
-                    
+
                     "artifactType": "HEAT_ENV",
                     "artifactURL": "hot-nimbus-oam_v1.0.env",
                     "artifactUUID": "EnvArtifact-UUID2",
                     "artifactVersion": "1.0"
-                  
+
                 },
 
                 {
@@ -68,19 +69,19 @@
                     "artifactURL": "nested-oam_v1.0.yaml",
                     "artifactUUID": "NestedArtifact-UUID3",
                     "artifactVersion": "1.0"
-          
+
                 },
 
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Script for OAM",
                     "artifactName": "mount_iso_script.sh",
-                    
+
                     "artifactType": "HEAT_ARTIFACT",
                     "artifactURL": "mount_iso_script.sh",
                     "artifactUUID": "ScriptArtifact-UUID1",
                     "artifactVersion": "1.0"
-          
+
                 },
 
                 {
@@ -93,19 +94,19 @@
                     "artifactUUID": "VolumeArtifact-UUID1",
                     "artifactVersion": "1.0",
                     "generatedArtifact": "VolumeEnvArtifact-UUID1"
-          
+
                 },
 
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Heat Env Vol for OAM",
                     "artifactName": "hot-nimbus-oam-volumes_v1.0.env",
-                    
+
                     "artifactType": "HEAT_ENV",
                     "artifactURL": "hot-nimbus-oam-volumes_v1.0.env",
                     "artifactUUID": "VolumeEnvArtifact-UUID1",
                     "artifactVersion": "1.0"
-          
+
                 }
             ]
         }
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/vnf-module-artifact.json
index 111bf04..70483dc 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/vnf-module-artifact.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/artifacts/vnf-module-artifact.json
@@ -4,6 +4,8 @@
     "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132",
     "vfModuleModelVersion": "1.0",
     "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI2_G6_withArtifacts::module-1.group",
+    "vfModuleModelDescription": "vf Module Description",
+    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f132",
     "isBase": true,
     "artifacts": [
       "Artifact-UUID1",
@@ -13,17 +15,21 @@
       "ScriptArtifact-UUID1",
       "VolumeArtifact-UUID1",
       "VolumeEnvArtifact-UUID1"
-    ]
+    ],
+    "properties": {"test":"test"}
   },
   {
     "vfModuleModelName": "VF_RI2_G91_withArtifacts::module-1",
     "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f169",
     "vfModuleModelVersion": "1.0",
     "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f63g.VF_RI2_G9_withArtifacts::module-1.group",
+    "vfModuleModelDescription": "vf Module Description",
+    "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f169",
     "isBase": true,
     "artifacts": [
       "HeatArtifactE2E-UUIDTest"
-   
-    ]
+
+    ],
+    "properties": {"test":"test"}
   }
 ]
\ No newline at end of file
diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/notif-structure.json
index 7ae9ff5..4d4cb97 100644
--- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/notif-structure.json
+++ b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/simpleNotif-V5/notif-structure.json
@@ -3,12 +3,12 @@
     "serviceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f134",
     "serviceUUID": "1e34774e-715e-4fd5-bd09-7b654622f35i",
     "serviceVersion": "5.0",
-    "serviceArtifacts": 
+    "serviceArtifacts":
     [
- 
+
     ],
 
-    "resources": 
+    "resources":
     [
         {
             "resourceInstanceName": "resource-1",
@@ -17,13 +17,14 @@
             "resourceType": "VF",
             "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f136",
             "resourceVersion": "3.0",
-            "artifacts": 
+            "category":  "category",
+            "artifacts":
             [
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Meta data for VFModule",
                     "artifactName": "vnf-module-artifact.json",
-                    
+
                     "artifactType": "VF_MODULES_METADATA",
                     "artifactURL": "vnf-module-artifact.json",
                     "artifactUUID": "VfArtifact-UUID2",
@@ -40,7 +41,7 @@
                     "artifactUUID": "Artifact-UUID1",
                     "artifactVersion": "1.0",
                     "generatedArtifact": "EnvArtifact-UUID2",
-                    "relatedArtifact": 
+                    "relatedArtifact":
                     [
                         "NestedArtifact-UUID3",
                         "ScriptArtifact-UUID1"
@@ -51,12 +52,12 @@
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Nimbus Heat ENV OAM",
                     "artifactName": "hot-nimbus-oam_v1.0.env",
-                    
+
                     "artifactType": "HEAT_ENV",
                     "artifactURL": "hot-nimbus-oam_v1.0.env",
                     "artifactUUID": "EnvArtifact-UUID2",
                     "artifactVersion": "1.0"
-                  
+
                 },
 
                 {
@@ -68,9 +69,9 @@
                     "artifactURL": "nested-oam_v1.0.yaml",
                     "artifactUUID": "NestedArtifact-UUID3",
                     "artifactVersion": "1.0"
-          
+
                 },
-                
+
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Nested PSM",
@@ -80,31 +81,31 @@
                     "artifactURL": "nested-psm_v1.0.yaml",
                     "artifactUUID": "NestedArtifact-UUID4",
                     "artifactVersion": "1.0"
-          
+
                 },
 
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Script for Nimbus",
                     "artifactName": "cloud-nimbus.sh",
-                    
+
                     "artifactType": "HEAT_ARTIFACT",
                     "artifactURL": "cloud-nimbus.sh",
                     "artifactUUID": "ScriptNimbusArtifact-UUID1",
                     "artifactVersion": "1.0"
-          
+
                 },
 
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Script for OAM",
                     "artifactName": "mount_iso_script.sh",
-                    
+
                     "artifactType": "HEAT_ARTIFACT",
                     "artifactURL": "mount_iso_script.sh",
                     "artifactUUID": "ScriptArtifact-UUID1",
                     "artifactVersion": "1.0"
-          
+
                 },
 
                 {
@@ -117,23 +118,23 @@
                     "artifactUUID": "VolumeArtifact-UUID1",
                     "artifactVersion": "1.0",
                     "generatedArtifact": "VolumeEnvArtifact-UUID1",
-                    "relatedArtifact": 
+                    "relatedArtifact":
                     [
                         "NestedArtifact-UUID4"
                     ]
-          
+
                 },
 
                 {
                     "artifactChecksum": "CheckSum",
                     "artifactDescription": "Heat Env Vol for OAM",
                     "artifactName": "hot-nimbus-oam-volumes_v1.0.env",
-                    
+
                     "artifactType": "HEAT_ENV",
                     "artifactURL": "hot-nimbus-oam-volumes_v1.0.env",
                     "artifactUUID": "VolumeEnvArtifact-UUID1",
                     "artifactVersion": "1.0"
-          
+
                 },
                 {
                     "artifactChecksum": "CheckSum",