aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Gao <victor.gao@huawei.com>2019-04-09 16:32:10 +0800
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-04-16 10:14:17 +0000
commitb99e5e9473e4a3abdc5980abf6a9132249e913b8 (patch)
tree8633befd7f04f198673e056b4a985d6d2af67480
parenta22260fc6631dfa681d532a91fcb1dcfa1cc4e89 (diff)
Support BBS Modeling in SDC
Change-Id: I9d5e960ed7ae46ea94d52fd14438f01948ff53dc Issue-ID: SDC-2228 Signed-off-by: Victor Gao <victor.gao@huawei.com>
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/OltNni/OltNni.json15
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/OltNni/OltNni.yml26
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/OntNni/OntNni.json15
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/OntNni/OntNni.yml17
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/PonUni/PonUni.json15
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/PonUni/PonUni.yml29
-rw-r--r--catalog-be/src/main/resources/scripts/import/tosca/importNfvTypes.py5
7 files changed, 121 insertions, 1 deletions
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/OltNni/OltNni.json b/catalog-be/src/main/resources/import/tosca/nfv-types/OltNni/OltNni.json
new file mode 100644
index 0000000000..b9955df75b
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/OltNni/OltNni.json
@@ -0,0 +1,15 @@
+{
+ "payloadName": "OltNni.yml",
+ "contactId": "jh0003",
+ "name": "OltNni",
+ "description": "OltNni",
+ "resourceIconPath": "port",
+ "resourceType": "CP",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Network Elements"
+ }]
+ }],
+ "tags": ["OltNni"]
+} \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/OltNni/OltNni.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/OltNni/OltNni.yml
new file mode 100644
index 0000000000..3f246d0939
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/OltNni/OltNni.yml
@@ -0,0 +1,26 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.cp.OltNni:
+ derived_from: tosca.nodes.nfv.VduCp
+ properties:
+ olt_name:
+ type: string
+ required: true
+ olt_nni_port:
+ type: string
+ required: true
+ olt_nni_slot:
+ type: string
+ required: true
+ svlan:
+ type: string
+ required: true
+ requirements:
+ - virtual_link:
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ relationship: tosca.relationships.nfv.VirtualLinksTo
+ node: tosca.nodes.nfv.VnfVirtualLink
+ - virtual_binding:
+ capability: tosca.capabilities.nfv.VirtualBindable
+ relationship: tosca.relationships.nfv.VirtualBindsTo
+ node: org.openecomp.resource.vfc.accessConnectivity
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/OntNni/OntNni.json b/catalog-be/src/main/resources/import/tosca/nfv-types/OntNni/OntNni.json
new file mode 100644
index 0000000000..d2ed4556f9
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/OntNni/OntNni.json
@@ -0,0 +1,15 @@
+{
+ "payloadName": "OntNni.yml",
+ "contactId": "jh0003",
+ "name": "OntNni",
+ "description": "OntNni",
+ "resourceIconPath": "port",
+ "resourceType": "CP",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Network Elements"
+ }]
+ }],
+ "tags": ["OntNni"]
+} \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/OntNni/OntNni.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/OntNni/OntNni.yml
new file mode 100644
index 0000000000..4210a104bb
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/OntNni/OntNni.yml
@@ -0,0 +1,17 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.cp.OntNni:
+ derived_from: tosca.nodes.nfv.VduCp
+ properties:
+ ont_port:
+ type: string
+ required: true
+ requirements:
+ - virtual_link:
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ relationship: tosca.relationships.nfv.VirtualLinksTo
+ node: tosca.nodes.nfv.VnfVirtualLink
+ - virtual_binding:
+ capability: tosca.capabilities.nfv.VirtualBindable
+ relationship: tosca.relationships.nfv.VirtualBindsTo
+ node: org.openecomp.resource.vfc.OntPnf
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/PonUni/PonUni.json b/catalog-be/src/main/resources/import/tosca/nfv-types/PonUni/PonUni.json
new file mode 100644
index 0000000000..2233c16216
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/PonUni/PonUni.json
@@ -0,0 +1,15 @@
+{
+ "payloadName": "PonUni.yml",
+ "contactId": "jh0003",
+ "name": "PonUni",
+ "description": "PonUni",
+ "resourceIconPath": "port",
+ "resourceType": "CP",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Network Elements"
+ }]
+ }],
+ "tags": ["PonUni"]
+} \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/PonUni/PonUni.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/PonUni/PonUni.yml
new file mode 100644
index 0000000000..a9c907d300
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/PonUni/PonUni.yml
@@ -0,0 +1,29 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.cp.PonUni:
+ derived_from: tosca.nodes.nfv.VduCp
+ properties:
+ expected_ont_id:
+ type: string
+ required: true
+ cvlan_id:
+ type: string
+ required: true
+ olt_name:
+ type: string
+ required: true
+ olt_pon_port:
+ type: string
+ required: true
+ olt_pon_slot:
+ type: string
+ required: true
+ requirements:
+ - virtual_link:
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ relationship: tosca.relationships.nfv.VirtualLinksTo
+ node: tosca.nodes.nfv.VnfVirtualLink
+ - virtual_binding:
+ capability: tosca.capabilities.nfv.VirtualBindable
+ relationship: tosca.relationships.nfv.VirtualBindsTo
+ node: org.openecomp.resource.vfc.accessConnectivity
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importNfvTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importNfvTypes.py
index 7c7ed410ec..667b8279c9 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/importNfvTypes.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importNfvTypes.py
@@ -42,7 +42,10 @@ def importNfvTypes(scheme, beHost, bePort, adminUser, fileDir, updateversion):
"vnfVirtualLink",
"vnfExtCp",
"vduCp",
- "VNF"
+ "VNF",
+ "PonUni",
+ "OltNni",
+ "OntNni"
]
responseCodes = [200, 201]