Support BBS Modeling in SDC

Change-Id: I9d5e960ed7ae46ea94d52fd14438f01948ff53dc
Issue-ID: SDC-2228
Signed-off-by: Victor Gao <victor.gao@huawei.com>

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 (file)
index 0000000..b9955df
--- /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 (file)
index 0000000..3f246d0
--- /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 (file)
index 0000000..d2ed455
--- /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 (file)
index 0000000..4210a10
--- /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 (file)
index 0000000..2233c16
--- /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 (file)
index 0000000..a9c907d
--- /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 7c7ed41..667b827 100644 (file)
--- 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]