Merge "remove neo4j classes" into release-1.1.0

diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.json b/catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.json
index 558a45b..49895e4 100644 (file)
--- a/catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.json
+++ b/catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.json
@@ -3,7 +3,7 @@
        "contactId": "jh0003",
        "name": "Ext Image File",
        "description": "Ext Image File",
-       "resourceIconPath": "default",
+       "resourceIconPath": "defaulticon",
        "resourceType": "VFC",
        "categories": [{
                "name": "Generic",

diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extLocalStorage/extLocalStorage.json b/catalog-be/src/main/resources/import/tosca/onap-types/extLocalStorage/extLocalStorage.json
index bce521b..6cfdd47 100644 (file)
--- a/catalog-be/src/main/resources/import/tosca/onap-types/extLocalStorage/extLocalStorage.json
+++ b/catalog-be/src/main/resources/import/tosca/onap-types/extLocalStorage/extLocalStorage.json
@@ -3,7 +3,7 @@
        "contactId": "jh0003",
        "name": "Ext Local Storage",
        "description": "Ext Local Storage",
-       "resourceIconPath": "default",
+       "resourceIconPath": "objectStorage",
        "resourceType": "VFC",
        "categories": [{
                "name": "Generic",

diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.yml b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.yml
index 75a867c..207047a 100644 (file)
--- a/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.yml
+++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.yml
@@ -67,7 +67,7 @@ node_types:
         - 0
         - UNBOUNDED
     - virtualLink: 
-        capability: tosca.capabilities.nfv.VirtualBindable
+        capability: tosca.capabilities.nfv.VirtualLinkable
         occurrences: 
         - 0
         - UNBOUNDED

diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.zip b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.zip
index 6626075..ca6d073 100644 (file)
Binary files a/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.zip and b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.zip differ