diff options
| author |   Michael Lando <ml636r@att.com> | 2017-10-22 12:58:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-22 12:58:13 +0000 |
| commit | a9a888c715b4e1395cfc5c2eef6dcab25bf1f7db (patch) | |
| tree | 348ec5cd8900153ad2616964ffa8324e8de403a8 /catalog-be/src/main/resources | |
| parent | 2693a68a809586b3809d3b2631d6c7670a732ecc (diff) | |
| parent | 5cd982ddfa6dabac12112482a77a864f03865369 (diff) | |
Merge "VoltE fix" into release-1.1.0
Diffstat (limited to 'catalog-be/src/main/resources')
5 files changed, 40 insertions, 1 deletions
diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/VDU/VDU.json b/catalog-be/src/main/resources/import/tosca/onap-types/VDU/VDU.json new file mode 100644 index 0000000000..5d721d4abc --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/VDU/VDU.json @@ -0,0 +1,15 @@ +{ + "payloadName": "VDU.yml", + "contactId": "jh0003", + "name": "VDU", + "description": "VDU", + "resourceIconPath": "compute", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Infrastructure" + }] + }], + "tags": ["VDU"] +}
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/VDU/VDU.yml b/catalog-be/src/main/resources/import/tosca/onap-types/VDU/VDU.yml new file mode 100644 index 0000000000..541126f7e3 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/VDU/VDU.yml @@ -0,0 +1,22 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.VDU: + derived_from: tosca.nodes.SoftwareComponent + capabilities: +#Not found in any spec +# high_availability: +# type: nfv.capabilities.HA + Virtualbinding: + type: tosca.capabilities.nfv.VirtualBindable +# monitoring_parameter: +# type: nfv.capabilities.Metric + requirements: +#Not found in any spec +# - high_availability: +# capability: nfv.capabilities.HA +# relationship: nfv.relationships.HA +# occurrences: [ 0, 1 ] + - host: + capability: tosca.capabilities.Container + node: tosca.nodes.Compute + relationship: tosca.relationships.HostedOn diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/VDU/VDU.zip b/catalog-be/src/main/resources/import/tosca/onap-types/VDU/VDU.zip Binary files differnew file mode 100644 index 0000000000..9010bf0544 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/VDU/VDU.zip diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml index e5d79fcacf..673e923182 100644 --- a/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml +++ b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml @@ -1,3 +1,4 @@ +#NOT SPEC COMPLAINT!!!!!!!!!!!!!!!!!!!!!! tosca_definitions_version: tosca_simple_yaml_1_0_0 node_types: tosca.nodes.nfv.VduCpd: diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py index 31c11c74bc..664c5cc64a 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py @@ -30,7 +30,8 @@ def importOnapTypes(beHost, bePort, adminUser, fileDir, updateversion): "vduCpd", "vduVirtualStorage", "vnfVirtualLinkDesc", - "NSD" + "NSD", + "VDU" ] responseCodes = [200, 201] |