diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | build-tools/pom.xml | 17 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/config/configuration.yaml | 16 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml | 13 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip | bin | 1162 -> 1132 bytes | |||
| -rw-r--r-- | common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java | 6 | ||||
| -rw-r--r-- | onboarding/pom.xml | 13 | ||||
| -rw-r--r-- | pom.xml | 1 | ||||
| -rw-r--r-- | sdc-os-chef/scripts/clean_images_except_base.sh | 1 | ||||
| -rw-r--r-- | sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb | 17 |
10 files changed, 58 insertions, 28 deletions
diff --git a/.gitignore b/.gitignore index 8668158b79..e38db8cb2b 100644 --- a/.gitignore +++ b/.gitignore @@ -164,3 +164,5 @@ sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites/* /sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb + +/common/openecomp-common-configuration-management/openecomp-configuration-management-cli/dependency-reduced-pom.xml diff --git a/build-tools/pom.xml b/build-tools/pom.xml index 952ebef380..24a6742b71 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -15,21 +15,4 @@ <version>1.1.0-SNAPSHOT</version> </parent> - <properties> - <pmd.version>5.8.1</pmd.version> - </properties> - - <dependencies> - <dependency> - <groupId>net.sourceforge.pmd</groupId> - <artifactId>pmd-core</artifactId> - <version>${pmd.version}</version> - </dependency> - <dependency> - <groupId>net.sourceforge.pmd</groupId> - <artifactId>pmd-java</artifactId> - <version>${pmd.version}</version> - </dependency> - </dependencies> - </project>
\ No newline at end of file diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml index 5242652188..eb26c8a34f 100644 --- a/catalog-be/src/main/resources/config/configuration.yaml +++ b/catalog-be/src/main/resources/config/configuration.yaml @@ -133,6 +133,7 @@ artifactTypes: - SNMP_POLL - SNMP_TRAP - GUIDE + - PLAN licenseTypes: - User @@ -322,6 +323,11 @@ serviceDeploymentArtifacts: - xml OTHER: acceptedTypes: + +#PLAN + PLAN: + acceptedTypes: + - xml resourceDeploymentArtifacts: HEAT: @@ -439,6 +445,11 @@ resourceDeploymentArtifacts: SNMP_TRAP: acceptedTypes: validForResourceTypes: *allResourceTypes + +#PLAN + PLAN: + acceptedTypes: + - xml resourceInstanceDeploymentArtifacts: HEAT_ENV: @@ -476,6 +487,11 @@ resourceInstanceDeploymentArtifacts: SNMP_TRAP: acceptedTypes: validForResourceTypes: *allResourceTypes + +#PLAN + PLAN: + acceptedTypes: + - xml resourceInformationalArtifacts: CHEF: diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml index eb6dfae372..68b87fd3c2 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml @@ -5,11 +5,11 @@ description: overlay L3 vpn type definitions # overlay tunnel type definitions # ***************************************************************************** -metadata: - id: : overlayTunnelDefinition - version: 0.1 - vendor: ONAP - template_author: ONAP +#metadata: +# id: : overlayTunnelDefinition +# version: 0.1 +# vendor: ONAP +# template_author: ONAP # ***************************************************************************** # node types @@ -23,8 +23,7 @@ node_types: org.openecomp.resource.vl.overlaytunnel: derived_from: tosca.nodes.Root - description: >- - This entity represents abstract overlay tunnel end point. + description: This entity represents abstract overlay tunnel end point. properties: id: type: string diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip Binary files differindex 99ddf491eb..55a836ff4c 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java b/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java index f13984bc67..6beec9de54 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java @@ -37,8 +37,10 @@ public enum ArtifactTypeEnum { DCAE_INVENTORY_POLICY("DCAE_INVENTORY_POLICY"), DCAE_INVENTORY_DOC("DCAE_INVENTORY_DOC"), DCAE_INVENTORY_BLUEPRINT("DCAE_INVENTORY_BLUEPRINT"), DCAE_INVENTORY_EVENT("DCAE_INVENTORY_EVENT"), // AAI Artifacts AAI_SERVICE_MODEL("AAI_SERVICE_MODEL"), AAI_VF_MODEL("AAI_VF_MODEL"), AAI_VF_MODULE_MODEL("AAI_VF_MODULE_MODEL"), AAI_VF_INSTANCE_MODEL("AAI_VF_INSTANCE_MODEL"), - // MIB artifacts - SNMP_POLL ("SNMP_POLL"), SNMP_TRAP("SNMP_TRAP"), GUIDE("GUIDE"); + // MIB Artifacts + SNMP_POLL ("SNMP_POLL"), SNMP_TRAP("SNMP_TRAP"), GUIDE("GUIDE"), + // PLAN Artifacts + PLAN("PLAN"); ArtifactTypeEnum(String type) { this.type = type; diff --git a/onboarding/pom.xml b/onboarding/pom.xml index b49b7801df..7c9b6267fd 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -96,7 +96,8 @@ <zusammen.version>0.2.0</zusammen.version> <zusammen-state-store.version>0.2.1</zusammen-state-store.version> <skipSA>true</skipSA> - <build.tools.version>1.1.0-SNAPSHOT</build.tools.version> + <pmd.version>5.8.1</pmd.version> + <build.tools.version>${project.version}</build.tools.version> </properties> <build> @@ -147,6 +148,16 @@ <artifactId>build-tools</artifactId> <version>${build.tools.version}</version> </dependency> + <dependency> + <groupId>net.sourceforge.pmd</groupId> + <artifactId>pmd-core</artifactId> + <version>${pmd.version}</version> + </dependency> + <dependency> + <groupId>net.sourceforge.pmd</groupId> + <artifactId>pmd-java</artifactId> + <version>${pmd.version}</version> + </dependency> </dependencies> </plugin> </plugins> @@ -407,6 +407,7 @@ <activeByDefault>false</activeByDefault> </activation> <modules> + <module>build-tools</module> <module>onboarding</module> </modules> </profile> diff --git a/sdc-os-chef/scripts/clean_images_except_base.sh b/sdc-os-chef/scripts/clean_images_except_base.sh new file mode 100644 index 0000000000..77e143a01e --- /dev/null +++ b/sdc-os-chef/scripts/clean_images_except_base.sh @@ -0,0 +1 @@ +docker rmi -f `docker images | grep -v base | awk '{print $3}'` diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index df9e74ad51..36e53fdd64 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -126,7 +126,7 @@ artifactTypes: - SNMP_POLL - SNMP_TRAP - GUIDE - + - PLAN licenseTypes: - User @@ -304,6 +304,11 @@ serviceDeploymentArtifacts: - xml OTHER: acceptedTypes: + +#PLAN + PLAN: + acceptedTypes: + - xml resourceDeploymentArtifacts: HEAT: @@ -421,6 +426,11 @@ resourceDeploymentArtifacts: SNMP_TRAP: acceptedTypes: validForResourceTypes: *allResourceTypes + +#PLAN + PLAN: + acceptedTypes: + - xml resourceInstanceDeploymentArtifacts: HEAT_ENV: @@ -458,6 +468,11 @@ resourceInstanceDeploymentArtifacts: SNMP_TRAP: acceptedTypes: validForResourceTypes: *allResourceTypes + +#PLAN + PLAN: + acceptedTypes: + - xml resourceInformationalArtifacts: CHEF: |