aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-be
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 /catalog-be
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>
Diffstat (limited to 'catalog-be')
-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
2 files changed, 31 insertions, 1 deletions
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: