summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoragileone <serge@agilitae.com>2019-04-15 13:06:45 -0700
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-04-16 10:20:30 +0000
commit821ddb419fb27d73bd00ef802a9c0fd1bf824bd6 (patch)
tree4f0539448321f08dabe671d3c6067e2caca0dc08
parentb99e5e9473e4a3abdc5980abf6a9132249e913b8 (diff)
Adds a new artifact for controller blueprint
Defines CONTROLLER_BLUEPRINT_ARCHIVE artifact type for PNF and VF. Issue-ID: SDC-2139 Change-Id: Ib28bb25a6751b053ffe50323bb7c16576bc181f4 Signed-off-by: agileone <serge@agilitae.com>
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb16
-rw-r--r--asdctool/src/main/resources/config/configuration.yaml15
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb16
-rw-r--r--catalog-be/src/main/resources/config/configuration.yaml16
-rw-r--r--common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java1
5 files changed, 62 insertions, 2 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 78e5eaaef4..aabdacc3af 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
@@ -136,6 +136,7 @@ artifactTypes:
- SNMP_TRAP
- GUIDE
- PLAN
+ - CONTROLLER_BLUEPRINT_ARCHIVE
licenseTypes:
- User
@@ -154,7 +155,11 @@ resourceTypes: &allResourceTypes
deploymentResourceArtifacts:
-
+ cdsBlueprint:
+ displayName: "CDS Blueprint"
+ type: CONTROLLER_BLUEPRINT_ARCHIVE
+ description: "CDS deployment artifact"
+ fileExtension: "zip"
deploymentResourceInstanceArtifacts:
heatEnv:
@@ -282,6 +287,9 @@ systemMonitoring:
defaultHeatArtifactTimeoutMinutes: 60
serviceDeploymentArtifacts:
+ CONTROLLER_BLUEPRINT_ARCHIVE:
+ acceptedTypes:
+ - zip
YANG_XML:
acceptedTypes:
- xml
@@ -480,6 +488,12 @@ resourceDeploymentArtifacts:
validForResourceTypes:
- VF
- PNF
+ CONTROLLER_BLUEPRINT_ARCHIVE:
+ acceptedTypes:
+ - zip
+ validForResourceTypes:
+ - VF
+ - PNF
#PLAN
PLAN:
diff --git a/asdctool/src/main/resources/config/configuration.yaml b/asdctool/src/main/resources/config/configuration.yaml
index c570344475..bdc6a43e12 100644
--- a/asdctool/src/main/resources/config/configuration.yaml
+++ b/asdctool/src/main/resources/config/configuration.yaml
@@ -153,6 +153,7 @@ artifactTypes:
- SNMP_POLL
- SNMP_TRAP
- GUIDE
+ - CONTROLLER_BLUEPRINT_ARCHIVE
licenseTypes:
- User
@@ -174,6 +175,11 @@ resourceTypes: &allResourceTypes
# - VF
# - VL
deploymentResourceArtifacts:
+ cdsBlueprint:
+ displayName: "CDS Blueprint"
+ type: CONTROLLER_BLUEPRINT_ARCHIVE
+ description: "CDS deployment artifact"
+ fileExtension: "zip"
# heat:
# displayName: "Base HEAT Template"
# type: HEAT
@@ -314,6 +320,9 @@ systemMonitoring:
defaultHeatArtifactTimeoutMinutes: 60
serviceDeploymentArtifacts:
+ CONTROLLER_BLUEPRINT_ARCHIVE:
+ acceptedTypes:
+ - zip
YANG_XML:
acceptedTypes:
- xml
@@ -499,6 +508,12 @@ resourceDeploymentArtifacts:
validForResourceTypes:
- VF
- PNF
+ CONTROLLER_BLUEPRINT_ARCHIVE:
+ acceptedTypes:
+ - zip
+ 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 65ee9a806d..df8b898318 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
@@ -136,6 +136,7 @@ artifactTypes:
- SNMP_TRAP
- GUIDE
- PLAN
+ - CONTROLLER_BLUEPRINT_ARCHIVE
licenseTypes:
- User
@@ -155,7 +156,11 @@ resourceTypes: &allResourceTypes
deploymentResourceArtifacts:
-
+ cdsBlueprint:
+ displayName: "CDS Blueprint"
+ type: CONTROLLER_BLUEPRINT_ARCHIVE
+ description: "CDS deployment artifact"
+ fileExtension: "zip"
deploymentResourceInstanceArtifacts:
heatEnv:
@@ -284,6 +289,9 @@ systemMonitoring:
defaultHeatArtifactTimeoutMinutes: 60
serviceDeploymentArtifacts:
+ CONTROLLER_BLUEPRINT_ARCHIVE:
+ acceptedTypes:
+ - zip
YANG_XML:
acceptedTypes:
- xml
@@ -489,6 +497,12 @@ resourceDeploymentArtifacts:
validForResourceTypes:
- VF
- PNF
+ CONTROLLER_BLUEPRINT_ARCHIVE:
+ acceptedTypes:
+ - zip
+ 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 01275dbd2a..1d9a51e6b3 100644
--- a/catalog-be/src/main/resources/config/configuration.yaml
+++ b/catalog-be/src/main/resources/config/configuration.yaml
@@ -154,6 +154,7 @@ artifactTypes:
- SNMP_POLL
- SNMP_TRAP
- GUIDE
+ - CONTROLLER_BLUEPRINT_ARCHIVE
licenseTypes:
- User
@@ -176,6 +177,11 @@ resourceTypes: &allResourceTypes
# - VF
# - VL
deploymentResourceArtifacts:
+ cdsBlueprint:
+ displayName: "CDS Blueprint"
+ type: CONTROLLER_BLUEPRINT_ARCHIVE
+ description: "CDS deployment artifact"
+ fileExtension: "zip"
# heat:
# displayName: "Base HEAT Template"
# type: HEAT
@@ -317,6 +323,9 @@ systemMonitoring:
defaultHeatArtifactTimeoutMinutes: 60
serviceDeploymentArtifacts:
+ CONTROLLER_BLUEPRINT_ARCHIVE:
+ acceptedTypes:
+ - zip
YANG_XML:
acceptedTypes:
- xml
@@ -514,6 +523,13 @@ resourceDeploymentArtifacts:
validForResourceTypes:
- VF
- PNF
+ CONTROLLER_BLUEPRINT_ARCHIVE:
+ acceptedTypes:
+ - zip
+ 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 cb7c513a8d..db40a6ccb6 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
@@ -32,6 +32,7 @@ public enum ArtifactTypeEnum {
HEAT_NET("HEAT_NET"), OTHER("OTHER"), WORKFLOW("WORKFLOW"), NETWORK_CALL_FLOW("NETWORK_CALL_FLOW"), TOSCA_TEMPLATE("TOSCA_TEMPLATE"), TOSCA_CSAR("TOSCA_CSAR"), VNF_CATALOG("VNF_CATALOG"), VF_LICENSE("VF_LICENSE"), BPEL("BPEL"),
VENDOR_LICENSE("VENDOR_LICENSE"), MODEL_INVENTORY_PROFILE("MODEL_INVENTORY_PROFILE"), MODEL_QUERY_SPEC("MODEL_QUERY_SPEC"), APPC_CONFIG("APPC_CONFIG"), HEAT_NESTED("HEAT_NESTED"), HEAT_ARTIFACT("HEAT_ARTIFACT"), CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT("CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT"),
VF_MODULES_METADATA("VF_MODULES_METADATA"), LIFECYCLE_OPERATIONS("LIFECYCLE_OPERATIONS"), VES_EVENTS("VES_EVENTS"), PERFORMANCE_COUNTER("PERFORMANCE_COUNTER"),UCPE_LAYER_2_CONFIGURATION("UCPE_LAYER_2_CONFIGURATION"),
+ CONTROLLER_BLUEPRINT_ARCHIVE("CONTROLLER_BLUEPRINT_ARCHIVE"),
// DCAE Artifacts
DCAE_TOSCA("DCAE_TOSCA"), DCAE_JSON("DCAE_JSON"), DCAE_POLICY("DCAE_POLICY"), DCAE_DOC("DCAE_DOC"), DCAE_EVENT("DCAE_EVENT"), DCAE_INVENTORY_TOSCA("DCAE_INVENTORY_TOSCA"), DCAE_INVENTORY_JSON("DCAE_INVENTORY_JSON"),
DCAE_INVENTORY_POLICY("DCAE_INVENTORY_POLICY"), DCAE_INVENTORY_DOC("DCAE_INVENTORY_DOC"), DCAE_INVENTORY_BLUEPRINT("DCAE_INVENTORY_BLUEPRINT"), DCAE_INVENTORY_EVENT("DCAE_INVENTORY_EVENT"),