Merge "Adding BNG port mapping for BBSIM"
diff --git a/tosca-configs/bbsim/bbsim-16.yaml b/tosca-configs/bbsim/bbsim-16.yaml
index 44c1d5d..746166b 100644
--- a/tosca-configs/bbsim/bbsim-16.yaml
+++ b/tosca-configs/bbsim/bbsim-16.yaml
@@ -53,6 +53,15 @@
node: service#volt
relationship: tosca.relationships.BelongsToOne
+ # map the BNG to a port
+ # this is not really used by BBSIM as there's no data-plane traffic,
+ # but it's required by NEM to configure the crossconnect
+ bngmapping:
+ type: tosca.nodes.BNGPortMapping
+ properties:
+ s_tag: any
+ switch_port: 1
+
# DHCP L2 Relay config
onos_app#dhcpl2relay:
type: tosca.nodes.ONOSApp
diff --git a/tosca-configs/bbsim/bbsim-2.yaml b/tosca-configs/bbsim/bbsim-2.yaml
index b5dd3cf..dc448a9 100644
--- a/tosca-configs/bbsim/bbsim-2.yaml
+++ b/tosca-configs/bbsim/bbsim-2.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod2-bbsim-2.yaml http://10.90.0.120:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @bbsim-2.yaml http://10.90.0.120:30007/run
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
@@ -53,26 +53,35 @@
node: service#volt
relationship: tosca.relationships.BelongsToOne
- # link
- onos_app#olt:
+ # map the BNG to a port
+ # this is not really used by BBSIM as there's no data-plane traffic,
+ # but it's required by NEM to configure the crossconnect
+ bngmapping:
+ type: tosca.nodes.BNGPortMapping
+ properties:
+ s_tag: any
+ switch_port: 1
+
+ # DHCP L2 Relay config
+ onos_app#dhcpl2relay:
type: tosca.nodes.ONOSApp
properties:
- name: olt
+ name: dhcpl2relay
must-exist: true
- olt-config-attr:
+ dhcpl2relay-config-attr:
type: tosca.nodes.ServiceInstanceAttribute
properties:
- name: /onos/v1/network/configuration/links
+ name: /onos/v1/network/configuration/apps/org.opencord.dhcpl2relay
value: >
{
- "of:0000000000000002/24-of:0000000000000012/65536": {
- "basic": {}
+ "dhcpl2relay" : {
+ "useOltUplinkForServerPktInOut" : true
}
}
requirements:
- service_instance:
- node: onos_app#olt
+ node: onos_app#dhcpl2relay
relationship: tosca.relationships.BelongsToOne
# Whitelist