From 4f6bc1ed9eb049712755e2e5adc17d9a55831ea8 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Mon, 16 Oct 2017 03:10:16 +0300 Subject: [PATCH] update normative types add NSD and genericNutronNet Change-Id: I78784273c019dfb8837223ba390b94c0cfc3f85d Issue-ID: SDC-410 Signed-off-by: Michael Lando --- .../genericNeutronNet/genericNeutronNet.json | 21 +++++++++ .../genericNeutronNet/genericNeutronNet.yml | 36 +++++++++++++++ .../genericNeutronNet/genericNeutronNet.zip | Bin 0 -> 611 bytes .../resources/import/tosca/onap-types/NSD/NSD.json | 15 +++++++ .../resources/import/tosca/onap-types/NSD/NSD.yml | 41 +++++++++++++++++ .../resources/import/tosca/onap-types/NSD/NSD.zip | Bin 0 -> 554 bytes .../scripts/import/tosca/importHeatTypes.py | 3 +- .../scripts/import/tosca/importOnapTypes.py | 3 +- .../scripts/import/tosca/typesToUpgrade.json | 49 +++++++++++++++++++-- 9 files changed, 162 insertions(+), 6 deletions(-) create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.json create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.yml create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.zip create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.json create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.yml create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.json b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.json new file mode 100644 index 0000000000..d9b008a870 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.json @@ -0,0 +1,21 @@ +{ + "payloadName": "genericNeutronNet.yml", + "contactId": "jh0003", + "name": "Generic NeutronNet", + "description": "Generic NeutronNet", + "resourceIconPath": "network", + "resourceType": "VL", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Network Elements" + } + ] + } +], + "tags": [ + "Generic NeutronNet" + ] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.yml b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.yml new file mode 100644 index 0000000000..12dc13e98b --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.yml @@ -0,0 +1,36 @@ +tosca_definitions_version: tosca_simple_yaml_1_0 +node_types: + org.openecomp.resource.vl.GenericNeutronNet: + derived_from: org.openecomp.resource.vl.extVL + description: Generic Neutron Network + properties: + network_role: + type: string + description: | + Unique label that defines the role that this network performs. example: vce oam network, vnat sr-iov1 network + network_assignments: + type: org.openecomp.datatypes.network.NetworkAssignments + network_flows: + type: org.openecomp.datatypes.network.NetworkFlows + network_scope: + type: string + network_ecomp_naming: + type: org.openecomp.datatypes.EcompNaming + network_type: + type: string + description: ECOMP supported network types. + default: NEUTRON + provider_network: + type: org.openecomp.datatypes.network.ProviderNetwork + network_technology: + type: string + description: ECOMP supported network technology + default: NEUTRON + network_homing: + type: org.openecomp.datatypes.EcompHoming + capabilities: + virtual_linkable: + type: tosca.capabilities.network.Linkable + occurrences: + - 1 + - UNBOUNDED \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.zip b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.zip new file mode 100644 index 0000000000000000000000000000000000000000..ed51f834f3fe9fe9af6aed7ea96f52e817afabfb GIT binary patch literal 611 zcmWIWW@Zs#U|`^2sAdiDu4Fi&yqS@K;TH=7gD6lmJvA@2C^OkFwX~!tKhH0vo0yRojYG?c?JtbR3T@Zl4ez$I-au z{Do%b-mT|3n9P4C&1uSBIpNg=&WZpXmGm4_j*zbspFFqp1vakZ*|z$k_4?S> zgm3HE#1F4&-PyFXYt?+eX&WLhJwNSYn7&@;-u~I&t((Pr9F0FkZd`t2Uc6Q4=Xj!8?p`yAwDqVCAsuUId9|McEoQ<)EMKmY8!T(jjfJupg0RUUx B0`33+ literal 0 HcmV?d00001 diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.json b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.json new file mode 100644 index 0000000000..22788ec06c --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.json @@ -0,0 +1,15 @@ +{ + "payloadName": "NSD.yml", + "contactId": "jh0003", + "name": "NSD", + "description": "NSD", + "resourceIconPath": "network", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Network Elements" + }] + }], + "tags": ["NSD"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.yml b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.yml new file mode 100644 index 0000000000..1b3d8820d5 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.yml @@ -0,0 +1,41 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.vfc.NSD: + derived_from: tosca.nodes.Root + description: ECOMP Allotted Resource base type all other allotted resources node types derive from + properties: + nsd_id: + type: string + required: true + description: ID of the NSD + nsd_designer: + type: string + required: true + description: Designer of the NSD + nsd_version: + type: string + required: true + description: Version of the NSD + nsd_name: + type: string + required: true + description: Name of the NSD + providing_service_uuid: + type: string + required: true + description: The depending service uuid in order to map the allotted resource to the specific service version + providing_service_invariant_uuid: + type: string + required: true + description: The depending service invariant uuid in order to map the allotted resource to the specific service version + providing_service_name: + type: string + required: true + description: The depending service name in order to map the allotted resource to the specific service version + requirements: + - virtualLink: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + capabilities: + virtual_linkable: + type: tosca.capabilities.network.Linkable diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.zip b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.zip new file mode 100644 index 0000000000000000000000000000000000000000..d741b50c16febf83fad1c0ecb7cbe7d7149acd31 GIT binary patch literal 554 zcmWIWW@Zs#U|`^22xSZK)@xz2p2o<)@ROB+fgLF77wn=}nVYjWWN+Rb1D<=#Ph@{E znO^$3ZPE3G4ztBFFN9w3{30tD8KiOZ;NDt|XtO!?3eCd4My_@CY6oQ|T|AZKJ&fRDCY3_yt$JJcEWH^aS9}}rEyTP+I zbKU>9-d!@?KFm>9i(Y7z1Q!Gq3p>p#o|M>CnezYR-}CSHe>l5yf^pQ2l^Y5!a4wwC zT*l{Qr+9j8+SwC~*9}$jxQnbwTe?`rvt~Z}JlV9=$rF}ZCs`cZ$tzlH* z0b9S1;-~80DQ;0Xn1kco`A0SH`qbMn1^JS$8JuBC`j% z{7=}=E~))jV9tGc`Hx$9GI8a>AGUu9SX%Pp^B#eH2OQ>9zpb0NKf2P;>J_u)sppmL zx`LBJpBdV-?929=YG)C1yR<51y?R&iORH~N%