summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkooper <sergey.sachkov@est.tech>2019-04-03 13:23:08 +0000
committerkooper <sergey.sachkov@est.tech>2019-04-03 13:23:08 +0000
commit570fe1445174c724577e0d481154ac7703393798 (patch)
tree37e340d822bc253a377b4574426ee940d1f3cd28
parentc6f9f152bbed844843e4f2a137bcfa1b726dd81f (diff)
Add artifact types
Change-Id: I48f2926623441d0729c5d5b476f3e72f962b64f8 Issue-ID: SDC-2156 Signed-off-by: kooper <sergey.sachkov@est.tech>
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb19
-rw-r--r--asdctool/src/main/resources/config/configuration.yaml19
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb19
-rw-r--r--catalog-be/src/main/resources/config/configuration.yaml19
-rw-r--r--common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java11
-rw-r--r--openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/resources/nonManoConfig.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/resources/nonManoConfig.yaml2
7 files changed, 83 insertions, 8 deletions
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb
index 9cfd409cc9..67a0503c8f 100644
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb
+++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb
@@ -458,6 +458,25 @@ resourceDeploymentArtifacts:
validForResourceTypes:
- VF
- PNF
+ YANG_MODULE:
+ acceptedTypes:
+ - yang
+ validForResourceTypes:
+ - VF
+ - PNF
+ ANSIBLE_PLAYBOOK:
+ acceptedTypes:
+ - yaml
+ - yml
+ validForResourceTypes:
+ - VF
+ - PNF
+ ONBOARDED_PACKAGE:
+ acceptedTypes:
+ - csar
+ validForResourceTypes:
+ - VF
+ - PNF
#PLAN
PLAN:
diff --git a/asdctool/src/main/resources/config/configuration.yaml b/asdctool/src/main/resources/config/configuration.yaml
index f481a10ae6..eef48108ee 100644
--- a/asdctool/src/main/resources/config/configuration.yaml
+++ b/asdctool/src/main/resources/config/configuration.yaml
@@ -477,6 +477,25 @@ resourceDeploymentArtifacts:
validForResourceTypes:
- VF
- PNF
+ YANG_MODULE:
+ acceptedTypes:
+ - yang
+ validForResourceTypes:
+ - VF
+ - PNF
+ ANSIBLE_PLAYBOOK:
+ acceptedTypes:
+ - yaml
+ - yml
+ validForResourceTypes:
+ - VF
+ - PNF
+ ONBOARDED_PACKAGE:
+ acceptedTypes:
+ - csar
+ validForResourceTypes:
+ - VF
+ - PNF
resourceInstanceDeploymentArtifacts:
HEAT_ENV:
diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
index d0c5a510b2..078b9b1cd9 100644
--- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
+++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
@@ -467,6 +467,25 @@ resourceDeploymentArtifacts:
validForResourceTypes:
- VF
- PNF
+ YANG_MODULE:
+ acceptedTypes:
+ - yang
+ validForResourceTypes:
+ - VF
+ - PNF
+ ANSIBLE_PLAYBOOK:
+ acceptedTypes:
+ - yaml
+ - yml
+ validForResourceTypes:
+ - VF
+ - PNF
+ ONBOARDED_PACKAGE:
+ acceptedTypes:
+ - csar
+ validForResourceTypes:
+ - VF
+ - PNF
#PLAN
PLAN:
diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml
index 632e15e02c..2a7e8e35d1 100644
--- a/catalog-be/src/main/resources/config/configuration.yaml
+++ b/catalog-be/src/main/resources/config/configuration.yaml
@@ -492,6 +492,25 @@ resourceDeploymentArtifacts:
validForResourceTypes:
- VF
- PNF
+ YANG_MODULE:
+ acceptedTypes:
+ - yang
+ validForResourceTypes:
+ - VF
+ - PNF
+ ANSIBLE_PLAYBOOK:
+ acceptedTypes:
+ - yaml
+ - yml
+ validForResourceTypes:
+ - VF
+ - PNF
+ ONBOARDED_PACKAGE:
+ acceptedTypes:
+ - csar
+ validForResourceTypes:
+ - VF
+ - PNF
resourceInstanceDeploymentArtifacts:
HEAT_ENV:
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 c0dc90e49a..cb7c513a8d 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
@@ -39,16 +39,15 @@ public enum ArtifactTypeEnum {
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"),
- PLAN("PLAN"),
- PM_DICTIONARY("PM_DICTIONARY")
- ;
-
+ PLAN("PLAN"), PM_DICTIONARY("PM_DICTIONARY"), YANG_MODULE("YANG_MODULE"),
+ ANSIBLE_PLAYBOOK("ANSIBLE_PLAYBOOK"), ONBOARDED_PACKAGE("ONBOARDED_PACKAGE");
+
+ private String type;
+
ArtifactTypeEnum(String type) {
this.type = type;
}
- private String type;
-
public String getType() {
return type;
}
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/resources/nonManoConfig.yaml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/resources/nonManoConfig.yaml
index b7e4b5b502..36bf38b842 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/resources/nonManoConfig.yaml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/resources/nonManoConfig.yaml
@@ -6,7 +6,7 @@ nonManoKeyFolderMapping:
location: PM_DICTIONARY
type: Deployment
onap_yang_modules:
- location: YANG_MODULES
+ location: YANG_MODULE
type: Deployment
onap_ansible_playbooks:
location: ANSIBLE_PLAYBOOK
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/resources/nonManoConfig.yaml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/resources/nonManoConfig.yaml
index c444e66c48..704ea1fc1c 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/resources/nonManoConfig.yaml
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/resources/nonManoConfig.yaml
@@ -6,7 +6,7 @@ nonManoKeyFolderMapping:
location: PM_DICTIONARY
type: Deployment
onap_yang_modules:
- location: YANG_MODULES
+ location: YANG_MODULE
type: Deployment
onap_ansible_playbooks:
location: ANSIBLE_PLAYBOOK