Merge "Update M-CORD POD Fabric information"
diff --git a/deployment-configs/onlab-ecord-local-pod1.yml b/deployment-configs/onlab-ecord-local-pod1.yml
index 7615c2d..4207018 100644
--- a/deployment-configs/onlab-ecord-local-pod1.yml
+++ b/deployment-configs/onlab-ecord-local-pod1.yml
@@ -48,3 +48,5 @@
ip: '10.6.0.101'
user: 'root'
pass: 'onl'
+ breakout_ports:
+ - 2
diff --git a/deployment-configs/onlab-ecord-local-pod2.yml b/deployment-configs/onlab-ecord-local-pod2.yml
index d6bb551..b7b081f 100644
--- a/deployment-configs/onlab-ecord-local-pod2.yml
+++ b/deployment-configs/onlab-ecord-local-pod2.yml
@@ -48,3 +48,5 @@
ip: '10.6.0.101'
user: 'root'
pass: 'onl'
+ breakout_ports:
+ - 2
diff --git a/deployment-configs/onlab-ecord-local-pod3.yml b/deployment-configs/onlab-ecord-local-pod3.yml
index ce77c08..6f98be2 100644
--- a/deployment-configs/onlab-ecord-local-pod3.yml
+++ b/deployment-configs/onlab-ecord-local-pod3.yml
@@ -48,3 +48,5 @@
ip: '10.6.0.101'
user: 'root'
pass: 'onl'
+ breakout_ports:
+ - 2
diff --git a/onlab-ecord-local-pod1.yml b/onlab-ecord-local-pod1.yml
index 60bb133..506bc52 100644
--- a/onlab-ecord-local-pod1.yml
+++ b/onlab-ecord-local-pod1.yml
@@ -72,3 +72,6 @@
ansible_ssh_pass: cord
compute:
+#Prefix for the domainId
+carrierethernet_domainid_prefix: 10.90.1.30
+
diff --git a/onlab-ecord-local-pod2.yml b/onlab-ecord-local-pod2.yml
index e41c234..b69e0d7 100644
--- a/onlab-ecord-local-pod2.yml
+++ b/onlab-ecord-local-pod2.yml
@@ -72,3 +72,6 @@
ansible_user: cord
ansible_ssh_pass: cord
compute:
+
+#Prefix for the domainId
+carrierethernet_domainid_prefix: 10.90.1.50
diff --git a/onlab-ecord-local-pod3.yml b/onlab-ecord-local-pod3.yml
index a864ae5..c7c73f9 100644
--- a/onlab-ecord-local-pod3.yml
+++ b/onlab-ecord-local-pod3.yml
@@ -72,3 +72,6 @@
ansible_user: cord
ansible_ssh_pass: cord
compute:
+
+#Prefix for the domainId
+carrierethernet_domainid_prefix: 10.90.1.70
diff --git a/onlab-mcord-pod1.yml b/onlab-mcord-pod1.yml
index 1acf72e..cc8fbe0 100644
--- a/onlab-mcord-pod1.yml
+++ b/onlab-mcord-pod1.yml
@@ -14,7 +14,7 @@
# limitations under the License.
cord_scenario: cord
-cord_profile: mcord-spirent
+cord_profile: mcord-ng4t
vagrant_vms:
- 'corddev'
diff --git a/qct-pod4-mcord.yml b/qct-pod4-mcord.yml
index 735245b..0929320 100644
--- a/qct-pod4-mcord.yml
+++ b/qct-pod4-mcord.yml
@@ -14,7 +14,7 @@
# limitations under the License.
cord_scenario: cord
-cord_profile: mcord
+cord_profile: mcord-ng4t
vagrant_vms:
- 'corddev'
diff --git a/use-cases/e-cord/onf/global-onos-cord.json b/use-cases/e-cord/onf/global-onos-cord.json
index 8d1c912..a5db9ab 100644
--- a/use-cases/e-cord/onf/global-onos-cord.json
+++ b/use-cases/e-cord/onf/global-onos-cord.json
@@ -3,9 +3,8 @@
"org.opencord.ce.global.vprovider" : {
"xos" : {
"username" : "xosadmin@opencord.org",
- "password" : "Cc42rM8rIKGTvguZjvv5",
- "address" : "10.90.1.10",
- "resource" : "/xosapi/v1/vnaas/usernetworkinterfaces/"
+ "password" : "0Ui8QNJNCdXrjjLpF1U6",
+ "endpoint" : "10.90.1.10:80/xosapi/v1/vnaas/usernetworkinterfaces"
}
},
"org.opencord.ce.global.channel.http" : {
diff --git a/use-cases/e-cord/onf/global-vnaas-service.yaml b/use-cases/e-cord/onf/global-vnaas-service.yaml
index 3cedda1..4637c6c 100644
--- a/use-cases/e-cord/onf/global-vnaas-service.yaml
+++ b/use-cases/e-cord/onf/global-vnaas-service.yaml
@@ -76,33 +76,6 @@
eir: 10000
name: platinum
- usernetworkinterface#UserNetworkInterface1:
- type: tosca.nodes.UserNetworkInterface
- requirements:
- properties:
- tenant: onf
- name: uni1
- latlng: [37.973535, -122.531087]
- cpe_id: domain:10.90.1.30-cord-onos/1
-
- usernetworkinterface#UserNetworkInterface2:
- type: tosca.nodes.UserNetworkInterface
- requirements:
- properties:
- tenant: onf
- name: uni2
- latlng: [37.773972, -122.431297]
- cpe_id: domain:10.90.1.50-cord-onos/1
-
- usernetworkinterface#UserNetworkInterface3:
- type: tosca.nodes.UserNetworkInterface
- requirements:
- properties:
- tenant: onf
- name: uni3
- latlng: [37.871637, -122.259750]
- cpe_id: domain:10.90.1.70-cord-onos/1
-
# eline#testeline:
# type: tosca.nodes.ELine
# requirements: