diff options
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.json | 2 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/onap-types/extLocalStorage/extLocalStorage.json | 2 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.yml | 2 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.zip | bin | 583 -> 586 bytes | |||
| -rw-r--r-- | onboarding/pom.xml | 1 | ||||
| -rw-r--r-- | openecomp-be/pom.xml | 2 | ||||
| -rw-r--r-- | sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_clearwater.zip | bin | 21937 -> 0 bytes |
7 files changed, 5 insertions, 4 deletions
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 558a45be09..49895e44a6 100644 --- 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 bce521b998..6cfdd47b1e 100644 --- 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 75a867ca45..207047a3d7 100644 --- 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 Binary files differindex 6626075fe4..ca6d0738de 100644 --- 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 diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 5bd0f3a106..f0a2edcd75 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -33,6 +33,7 @@ <mvn.surefire.version>2.19.1</mvn.surefire.version> <mvn.swagger.version>3.1.0</mvn.swagger.version> <mvn.war.version>2.1.1</mvn.war.version> + <mvn.antrun.version>1.8</mvn.antrun.version> <!-- Onboarding artifacts version --> <openecomp.sdc.common.version>${project.version}</openecomp.sdc.common.version> diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml index e09fe8cbed..442b7dec15 100644 --- a/openecomp-be/pom.xml +++ b/openecomp-be/pom.xml @@ -148,7 +148,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> + <version>${mvn.antrun.version}</version> <executions> <execution> <phase>post-integration-test</phase> diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_clearwater.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_clearwater.zip Binary files differdeleted file mode 100644 index bb91a948a6..0000000000 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_clearwater.zip +++ /dev/null |