summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordermot123 <dermot.melia@est.tech>2019-03-13 12:37:35 +0000
committerdermot123 <dermot.melia@est.tech>2019-03-13 12:37:35 +0000
commitd83268a4cb465fa79f8b57483517226d588fb427 (patch)
treec8f32b63d00954987829918af2da2947d5d9f186
parent56e535b98ea753d7b64dfbdb9d64d380457eaba5 (diff)
Add Deployment Artifacts to PNF
Add support for PM_Dictionary and VES Events Deployment Artifacts to PNF Change-Id: Ief85d40bd180aae0662cfb58f794f5b0d7e5ec9c Issue-ID: SDC-2109 Issue-ID: SDC-2155 Signed-off-by: dermot123 <dermot.melia@est.tech>
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb17
-rw-r--r--asdctool/src/main/resources/config/configuration.yaml17
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb18
-rw-r--r--catalog-be/src/main/resources/config/configuration.yaml18
-rw-r--r--catalog-ui/configurations/menu.js1
-rw-r--r--catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view.html2
-rw-r--r--catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts13
-rw-r--r--catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view.html2
-rw-r--r--common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java3
9 files changed, 82 insertions, 9 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 52697f7260..ed98008c7b 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
@@ -378,7 +378,15 @@ resourceDeploymentArtifacts:
acceptedTypes:
- yaml
- yml
- validForResourceTypes: *allResourceTypes
+ validForResourceTypes:
+ - VFC
+ - CP
+ - VL
+ - VF
+ - VFCMT
+ - Abstract
+ - CVFC
+ - PNF
PERFORMANCE_COUNTER:
acceptedTypes:
- csv
@@ -435,6 +443,13 @@ resourceDeploymentArtifacts:
SNMP_TRAP:
acceptedTypes:
validForResourceTypes: *allResourceTypes
+ PM_DICTIONARY:
+ acceptedTypes:
+ - yaml
+ - yml
+ validForResourceTypes:
+ - VF
+ - PNF
#PLAN
PLAN:
diff --git a/asdctool/src/main/resources/config/configuration.yaml b/asdctool/src/main/resources/config/configuration.yaml
index 3b58372f37..f481a10ae6 100644
--- a/asdctool/src/main/resources/config/configuration.yaml
+++ b/asdctool/src/main/resources/config/configuration.yaml
@@ -405,7 +405,15 @@ resourceDeploymentArtifacts:
acceptedTypes:
- yaml
- yml
- validForResourceTypes: *allResourceTypes
+ validForResourceTypes:
+ - VFC
+ - CP
+ - VL
+ - VF
+ - VFCMT
+ - Abstract
+ - CVFC
+ - PNF
PERFORMANCE_COUNTER:
acceptedTypes:
- csv
@@ -462,6 +470,13 @@ resourceDeploymentArtifacts:
SNMP_TRAP:
acceptedTypes:
validForResourceTypes: *allResourceTypes
+ PM_DICTIONARY:
+ acceptedTypes:
+ - yaml
+ - yml
+ 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 0204673160..78468b46f9 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
@@ -386,7 +386,16 @@ resourceDeploymentArtifacts:
acceptedTypes:
- yaml
- yml
- validForResourceTypes: *allResourceTypes
+ validForResourceTypes:
+ - VFC
+ - CP
+ - VL
+ - VF
+ - CR
+ - VFCMT
+ - Abstract
+ - CVFC
+ - PNF
PERFORMANCE_COUNTER:
acceptedTypes:
- csv
@@ -443,6 +452,13 @@ resourceDeploymentArtifacts:
SNMP_TRAP:
acceptedTypes:
validForResourceTypes: *allResourceTypes
+ PM_DICTIONARY:
+ acceptedTypes:
+ - yaml
+ - yml
+ 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 610fd72eb3..12815b1415 100644
--- a/catalog-be/src/main/resources/config/configuration.yaml
+++ b/catalog-be/src/main/resources/config/configuration.yaml
@@ -411,7 +411,16 @@ resourceDeploymentArtifacts:
acceptedTypes:
- yaml
- yml
- validForResourceTypes: *allResourceTypes
+ validForResourceTypes:
+ - VFC
+ - CP
+ - VL
+ - VF
+ - CR
+ - VFCMT
+ - Abstract
+ - CVFC
+ - PNF
PERFORMANCE_COUNTER:
acceptedTypes:
- csv
@@ -468,6 +477,13 @@ resourceDeploymentArtifacts:
SNMP_TRAP:
acceptedTypes:
validForResourceTypes: *allResourceTypes
+ PM_DICTIONARY:
+ acceptedTypes:
+ - yaml
+ - yml
+ validForResourceTypes:
+ - VF
+ - PNF
resourceInstanceDeploymentArtifacts:
HEAT_ENV:
diff --git a/catalog-ui/configurations/menu.js b/catalog-ui/configurations/menu.js
index d93b3ac45c..d9138ae4c5 100644
--- a/catalog-ui/configurations/menu.js
+++ b/catalog-ui/configurations/menu.js
@@ -475,6 +475,7 @@ const SDC_MENU_CONFIG = {
],
"PNF": [
{"text": "General", "action": "onMenuItemPressed", "state": "workspace.general"},
+ {"text": "Deployment Artifact", "action": "onMenuItemPressed", "state": "workspace.deployment_artifacts"},
{"text": "Information Artifact", "action": "onMenuItemPressed", "state": "workspace.information_artifacts"},
{"text": "TOSCA Artifacts", "action": "onMenuItemPressed", "state": "workspace.tosca_artifacts"},
{"text": "Composition", "action": "onMenuItemPressed", "state": "workspace.composition.details"},
diff --git a/catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view.html b/catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view.html
index a571fdca0d..5559e534b9 100644
--- a/catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view.html
+++ b/catalog-ui/src/app/view-models/workspace/tabs/composition/composition-view.html
@@ -81,7 +81,7 @@
data-ui-sref="workspace.composition.deployment"
tooltips tooltip-class="tooltip-custom tab-tooltip" tooltip-content="Deployment Artifacts"
data-tests-id="deployment-artifact-tab"
- data-ng-if="!isPNF() && !isConfiguration() && !(isComponentInstanceSelected() && currentComponent.selectedInstance.isServiceProxy())"
+ data-ng-if="!isConfiguration() && !(isComponentInstanceSelected() && currentComponent.selectedInstance.isServiceProxy())"
data-ng-class="{'disabled': disabledTabs}">
<div class="i-sdc-designer-sidebar-tab-icon sprite-new deployment-artifacts"></div>
</button>
diff --git a/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts
index 627d20528e..2af341b2c1 100644
--- a/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts
+++ b/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts
@@ -7,9 +7,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -50,6 +50,7 @@ export interface IArtifactsViewModelScope extends ICompositionViewModelScope {
getEnvArtifact(heatArtifact:ArtifactModel):any;
getEnvArtifactName(artifact:ArtifactModel):string;
isLicenseArtifact(artifact:ArtifactModel):boolean;
+ isVfOrPnf():boolean;
//isVFiArtifact(artifact:ArtifactModel):boolean;
}
@@ -329,6 +330,14 @@ export class ResourceArtifactsViewModel {
});
};
+ this.$scope.isVfOrPnf = ():boolean => {
+ if (this.$scope.selectedComponent.isResource()) {
+ let selectedResourceType = (<Resource>this.$scope.selectedComponent).resourceType;
+ return selectedResourceType == 'VF' || selectedResourceType == 'PNF';
+ }
+ return false;
+ }
+
this.eventListenerService.registerObserverCallback(GRAPH_EVENTS.ON_NODE_SELECTED, this.loadArtifacts);
this.eventListenerService.registerObserverCallback(GRAPH_EVENTS.ON_GRAPH_BACKGROUND_CLICKED, this.loadArtifacts);
diff --git a/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view.html b/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view.html
index ce1b8aef11..ec81ed81ee 100644
--- a/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view.html
+++ b/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view.html
@@ -77,7 +77,7 @@
</div>
</div>
- <div class="w-sdc-designer-sidebar-section-footer" data-ng-if="!isViewMode() && artifactType!=='api' && (!isComponentInstanceSelected()||selectedComponent.resourceType=='VF') && ('deployment' != artifactType || selectedComponent.isComplex())">
+ <div class="w-sdc-designer-sidebar-section-footer" data-ng-if="!isViewMode() && artifactType!=='api' && (!isComponentInstanceSelected()||isVfOrPnf()) && ('deployment' != artifactType || selectedComponent.isComplex())">
<button class="w-sdc-designer-sidebar-section-footer-action tlv-btn blue" data-tests-id="add_Artifact_Button" data-ng-click="addOrUpdate({})" type="button">Add Artifact</button>
</div>
</div>
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 47babeee9b..c0dc90e49a 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,7 +39,8 @@ 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")
+ PLAN("PLAN"),
+ PM_DICTIONARY("PM_DICTIONARY")
;
ArtifactTypeEnum(String type) {