New config format for virtualbng app
diff --git a/xos/configurations/cord/cord.yaml b/xos/configurations/cord/cord.yaml
index 9d850b2..6412793 100644
--- a/xos/configurations/cord/cord.yaml
+++ b/xos/configurations/cord/cord.yaml
@@ -61,23 +61,26 @@
relationship: tosca.relationships.UsedByService
properties:
dependencies: org.onosproject.proxyarp, org.onosproject.virtualbng, org.onosproject.openflow, org.onosproject.fwd
- config_addresses.json: >
+ config_network-cfg.json: >
{
- "addresses" : [
- {
- "dpid" : "00:00:00:00:00:00:00:a1",
- "port" : "1",
- "ips" : [10.0.1.253/24"],
- "mac" : "00:00:00:00:00:99"
-
- },
- {
- "dpid" : "00:00:00:00:00:00:00:a5",
- "port" : "2",
- "ips" : ["10.254.0.1/24"],
- "mac" : "00:00:00:00:00:98"
- }
- ]
+ "ports" : {
+ "of:00000000000000a1/1" : {
+ "interfaces" : [
+ {
+ "ips" : [ "10.0.1.253/24" ],
+ "mac" : "00:00:00:00:00:99"
+ }
+ ]
+ },
+ "of:00000000000000a5/2" : {
+ "interfaces" : [
+ {
+ "ips" : [ "10.254.0.1/24" ],
+ "mac" : "00:00:00:00:00:98"
+ }
+ ]
+ }
+ }
}
config_virtualbng.json: >
{
@@ -90,7 +93,6 @@
"xosRestPort" : "9999"
}
-
# Network templates
Private:
type: tosca.nodes.NetworkTemplate
@@ -217,7 +219,7 @@
relationship: tosca.relationships.MemberOfSite
mysite_clients:
- description: slice for clients at the subscriber
+ description: slice for clients at the subscriber
type: tosca.nodes.Slice
requirements:
- site:
diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index 055817d..039b433 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -120,6 +120,9 @@
config_addresses.json:
type: string
required: false
+ config_network-cfg.json:
+ type: string
+ required: false
config_virtualbng.json:
type: string
required: false
@@ -686,4 +689,3 @@
tosca.capabilities.xos.Image:
derived_from: tosca.capabilities.Root
description: An XOS Image
-
diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index 409e86b..3cbe4b2 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -131,6 +131,9 @@
config_addresses.json:
type: string
required: false
+ config_network-cfg.json:
+ type: string
+ required: false
config_virtualbng.json:
type: string
required: false
@@ -869,4 +872,3 @@
tosca.capabilities.xos.Image:
derived_from: tosca.capabilities.Root
description: An XOS Image
-