Various pod fixes, updated bw profiles
Change-Id: I24bc290f7ae7865656c0105f73a3f5888dfe170e
diff --git a/use-cases/e-cord/onf/global-vnaas-service.yaml.j2 b/use-cases/e-cord/onf/global-vnaas-service.yaml.j2
index e91a9ec..cc0cb04 100644
--- a/use-cases/e-cord/onf/global-vnaas-service.yaml.j2
+++ b/use-cases/e-cord/onf/global-vnaas-service.yaml.j2
@@ -42,8 +42,8 @@
properties:
cbs: 1000
ebs: 1200
- cir: 1000000
- eir: 1200000
+ cir: 1000
+ eir: 1200
name: bronze
bandwidthprofile#silver:
@@ -52,8 +52,8 @@
properties:
cbs: 1500
ebs: 2000
- cir: 1500000
- eir: 2000000
+ cir: 10000
+ eir: 2000
name: silver
bandwidthprofile#gold:
@@ -62,8 +62,8 @@
properties:
cbs: 2000
ebs: 2700
- cir: 2000000
- eir: 2700000
+ cir: 20000
+ eir: 5000
name: gold
bandwidthprofile#platinum:
@@ -72,8 +72,8 @@
properties:
cbs: 2500
ebs: 3200
- cir: 2500000
- eir: 3200000
+ cir: 100000
+ eir: 10000
name: platinum
usernetworkinterface#UserNetworkInterface1:
diff --git a/use-cases/e-cord/onf/local-1-onos-cord.json b/use-cases/e-cord/onf/local-1-onos-cord.json
index 88a2761..707e3d4 100644
--- a/use-cases/e-cord/onf/local-1-onos-cord.json
+++ b/use-cases/e-cord/onf/local-1-onos-cord.json
@@ -16,12 +16,12 @@
}
},
"links": {
- "netconf:10.6.0.160:830/0-of:0000001e08095936/49" : {
+ "netconf:10.6.0.160:830/0-of:0000001e08095936/50" : {
"basic" : {
"type" : "DIRECT"
}
},
- "of:0000001e08095936/49-netconf:10.6.0.160:830/0" : {
+ "of:0000001e08095936/50-netconf:10.6.0.160:830/0" : {
"basic" : {
"type" : "DIRECT"
}
@@ -38,7 +38,7 @@
{
"mefPortType" : "INNI",
"connectPoint" : "of:0000001e08095936/50",
- "interlinkId" : "EE-2-fabric"
+ "interlinkId" : "EE-1-to-fabric"
}
]
},
diff --git a/use-cases/e-cord/onf/local-1-onos-fabric.json b/use-cases/e-cord/onf/local-1-onos-fabric.json
index 2f71057..ca0d367 100644
--- a/use-cases/e-cord/onf/local-1-onos-fabric.json
+++ b/use-cases/e-cord/onf/local-1-onos-fabric.json
@@ -14,7 +14,7 @@
[
{
"mefPortType" : "INNI",
- "connectPoint" : "of:0000cc37ab7cbd64/2",
+ "connectPoint" : "of:0000cc37ab7cbd64/37",
"interlinkId" : "EE-1-to-fabric"
},
{
diff --git a/use-cases/e-cord/onf/local-2-onos-cord.json b/use-cases/e-cord/onf/local-2-onos-cord.json
index 6b1a0b5..7e800d6 100644
--- a/use-cases/e-cord/onf/local-2-onos-cord.json
+++ b/use-cases/e-cord/onf/local-2-onos-cord.json
@@ -1,10 +1,10 @@
{
"devices": {
- "netconf:10.6.0.161:830": {
+ "netconf:10.6.0.162:830": {
"netconf": {
"username": "admin",
"password": "admin",
- "ip": "10.6.0.161",
+ "ip": "10.6.0.162",
"port": "830"
},
"basic": {
@@ -15,25 +15,14 @@
}
}
},
- "links": {
- "netconf:10.6.0.161:830/0-of:0000cc37ab7cc2fa/2" : {
- "basic" : {
- "type" : "DIRECT"
- }
- },
- "of:0000cc37ab7cc2fa/2-netconf:10.6.0.161:830/0" : {
- "basic" : {
- "type" : "DIRECT"
- }
- }
- },
"apps" : {
"org.opencord.ce.local.bigswitch" : {
"mefPorts" :
[
{
- "mefPortType" : "UNI",
- "connectPoint" : "netconf:10.6.0.161:830/0"
+ "mefPortType" : "UNI",
+ "connectPoint" : "netconf:10.6.0.162:830/0",
+ "interlinkId" : "UNI-2-to-fabric"
}
]
},
diff --git a/use-cases/e-cord/onf/local-2-onos-fabric.json b/use-cases/e-cord/onf/local-2-onos-fabric.json
index 559a6db..056e0fc 100644
--- a/use-cases/e-cord/onf/local-2-onos-fabric.json
+++ b/use-cases/e-cord/onf/local-2-onos-fabric.json
@@ -14,8 +14,8 @@
[
{
"mefPortType" : "INNI",
- "connectPoint" : "of:0000cc37ab7cc2fa/2",
- "interlinkId" : "EE-2-to-fabric"
+ "connectPoint" : "of:0000cc37ab7cc2fa/37",
+ "interlinkId" : "UNI-2-to-fabric"
},
{
"mefPortType" : "ENNI",