[CORD-1324] updating profiles for ecord
Change-Id: I2377a016a2b9c1d072f8da435c206e71f3ee4b0b
diff --git a/profile_manifests/ecord-global.yml b/profile_manifests/ecord-global.yml
index 7ce4486..dc7cb70 100644
--- a/profile_manifests/ecord-global.yml
+++ b/profile_manifests/ecord-global.yml
@@ -44,18 +44,26 @@
xos_services:
- name: vtn
path: onos-apps/apps/vtn
+ synchronizer: true
- name: openstack
path: orchestration/xos_services/openstack
+ synchronizer: true
- name: onos
path: orchestration/xos_services/onos-service
- - name: metronetwork
+ synchronizer: true
+ - name: metro-net
path: orchestration/xos_services/metro-net
+ synchronizer: true
xos_service_sshkeys:
- name: onos_rsa
source_path: "~/.ssh/id_rsa"
- name: onos_rsa.pub
source_path: "~/.ssh/id_rsa.pub"
+ - name: metro-net_rsa
+ source_path: "~/.ssh/id_rsa"
+ - name: metro-net_rsa.pub
+ source_path: "~/.ssh/id_rsa.pub"
# VM networks/bridges on head
virt_nets:
@@ -98,6 +106,10 @@
name_on_public_interface: head
+# VTN network configuration
+management_network_cidr: 172.27.0.0/24
+management_network_ip: 172.27.0.1/24
+data_plane_ip: 10.168.0.253/24
# CORD ONOS app version
cord_app_version: 1.2-SNAPSHOT
diff --git a/profile_manifests/mock-ecord-global.yml b/profile_manifests/mock-ecord-global.yml
index 07feeef..b7dbf3b 100644
--- a/profile_manifests/mock-ecord-global.yml
+++ b/profile_manifests/mock-ecord-global.yml
@@ -37,8 +37,10 @@
xos_services:
- name: onos
path: orchestration/xos_services/onos-service
- - name: metronetwork
+ synchronizer: true
+ - name: metro-net
path: orchestration/xos_services/metro-net
+ synchronizer: true
xos_service_sshkeys:
- name: onos_rsa
diff --git a/roles/cord-profile/templates/vnodglobal-service.yaml.j2 b/roles/cord-profile/templates/vnodglobal-service.yaml.j2
index a40076d..a1b57ff 100644
--- a/roles/cord-profile/templates/vnodglobal-service.yaml.j2
+++ b/roles/cord-profile/templates/vnodglobal-service.yaml.j2
@@ -7,64 +7,107 @@
description: vnodglobal services, generated by platform-install
topology_template:
- node_templates:
+ node_templates:
- bandwidthprofile#ecordbandwidthprofile:
- type: tosca.nodes.EcordBandwidthProfile
- requirements:
- properties:
- bwpcfgcbs: 1000
- bwpcfgebs: 1200
- bwpcfgcir: 1000000
- bwpcfgeir: 1200000
- name: ecordbandwidthprofile
+ enterpriselocation#onlab:
+ type: tosca.nodes.EnterpriseLocation
+ requirements:
+ properties:
+ name: onlab
+ cord_site_ip: 127.0.0.1
+ cord_site_port: 8181
+ cord_site_username: onos
+ cord_site_password: rocks
+ cord_site_type: onos
- bandwidthprofile#UniBandwidthprofile:
- type: tosca.nodes.EcordBandwidthProfile
- requirements:
- properties:
- bwpcfgcbs: 100
- bwpcfgebs: 50
- bwpcfgcir: 600
- bwpcfgeir: 50
- name: unibandwidthprofile
- bandwidthprofile#EvcBandwidthprofile:
- type: tosca.nodes.EcordBandwidthProfile
- requirements:
- properties:
- bwpcfgcbs: 100
- bwpcfgebs: 50
- bwpcfgcir: 600
- bwpcfgeir: 50
- name: evcbandwidthprofile
+ enterpriselocation#onlab1:
+ type: tosca.nodes.EnterpriseLocation
+ requirements:
+ properties:
+ name: onlab1
+ cord_site_ip: 127.0.0.2
+ cord_site_port: 8181
+ cord_site_username: onos
+ cord_site_password: rocks
+ cord_site_type: onos
- bandwidthprofile#FlowBandwidthprofile:
- type: tosca.nodes.EcordBandwidthProfile
- requirements:
- properties:
- bwpcfgcbs: 100
- bwpcfgebs: 50
- bwpcfgcir: 600
- bwpcfgeir: 50
- name: flowbandwidthprofile
+ onosmodel#onlab:
+ type: tosca.nodes.OnosModel
+ requirements:
+ properties:
+ name: onlabT
+ onos_ip: 127.0.0.1
+ onos_port: 8181
+ onos_username: onos
+ onos_password: rocks
+ onos_type: global
- usernetworkinterface#UserNetworkInterface1:
- type: tosca.nodes.EcordUserNetworkInterface
- requirements:
- properties:
- enabled: true
- capacity: 10000000
- bw_used: 50000
- vlanIds: [100,200,300]
- name: uni1
- location: San Rafael
- latlng: [-122.531087, 37.973535]
+ bandwidthprofile#bronze:
+ type: tosca.nodes.BandwidthProfile
+ requirements:
+ properties:
+ cbs: 1000
+ ebs: 1200
+ cir: 1000000
+ eir: 1200000
+ name: bronze
- service#vnodglobal:
- type: tosca.nodes.VNodGlobalService
- requirements:
- - bandwith_profile:
- node: bandwidthprofile#ecordbandwidthprofile
- relationship: tosca.relationships.UsesBandwidthProfile
- properties:
\ No newline at end of file
+ bandwidthprofile#silver:
+ type: tosca.nodes.BandwidthProfile
+ requirements:
+ properties:
+ cbs: 1500
+ ebs: 2000
+ cir: 1500000
+ eir: 2000000
+ name: silver
+
+ bandwidthprofile#gold:
+ type: tosca.nodes.BandwidthProfile
+ requirements:
+ properties:
+ cbs: 2000
+ ebs: 2700
+ cir: 2000000
+ eir: 2700000
+ name: gold
+
+ bandwidthprofile#platinum:
+ type: tosca.nodes.BandwidthProfile
+ requirements:
+ properties:
+ cbs: 2500
+ ebs: 3200
+ cir: 2500000
+ eir: 3200000
+ name: platinum
+
+ usernetworkinterface#UserNetworkInterface1:
+ type: tosca.nodes.UserNetworkInterface
+ requirements:
+ properties:
+ tenant: onlab
+ name: uni1
+ latlng: [37.973535, -122.531087]
+ cpe_id: netconf:192.168.56.10:830/0
+
+ usernetworkinterface#UserNetworkInterface2:
+ type: tosca.nodes.UserNetworkInterface
+ requirements:
+ properties:
+ tenant: onlab
+ name: uni2
+ latlng: [37.773972, -122.431297]
+ cpe_id: netconf:192.168.56.20:830/0
+
+ eline#testeline:
+ type: tosca.nodes.ELine
+ requirements:
+ properties:
+ name: testeline
+ connect_point_1_id: netconf:192.168.56.10:830/0
+ connect_point_2_id: netconf:192.168.56.20:830/0
+ vlanids: 100
+ cord_site_name: onlabT
+ bwp: gold
\ No newline at end of file