Remove default configs
Change-Id: I1a217d414994b7bfcd140111111df0b04a2e7dcf
diff --git a/roles/cord-profile/templates/fabric-network-cfg.json.j2 b/roles/cord-profile/templates/fabric-network-cfg.json.j2
index 8609ef8..9e26dfe 100644
--- a/roles/cord-profile/templates/fabric-network-cfg.json.j2
+++ b/roles/cord-profile/templates/fabric-network-cfg.json.j2
@@ -1,100 +1 @@
-{
- "ports" : {
- "of:0000000000000001/1" : {
- "interfaces" : [
- {
- "ips" : [ "10.6.1.0/24" ]
- }
- ]
- },
- "of:0000000000000001/2" : {
- "interfaces" : [
- {
- "ips" : [ "10.6.1.0/24" ]
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "10.6.2.0/24" ]
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.6.2.0/24" ]
- }
- ]
- }
- },
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "name" : "Leaf-R1",
- "nodeSid" : 101,
- "routerIp" : "10.6.1.254",
- "routerMac" : "00:00:00:00:01:80",
- "isEdgeRouter" : true,
- "adjacencySids" : []
- }
- },
- "of:0000000000000002" : {
- "segmentrouting" : {
- "name" : "Leaf-R2",
- "nodeSid" : 102,
- "routerIp" : "10.6.2.254",
- "routerMac" : "00:00:00:00:02:80",
- "isEdgeRouter" : true,
- "adjacencySids" : []
- }
- },
- "of:0000000000000191" : {
- "segmentrouting" : {
- "name" : "Spine-R1",
- "nodeSid" : 103,
- "routerIp" : "192.168.0.11",
- "routerMac" : "00:00:01:00:11:80",
- "isEdgeRouter" : false,
- "adjacencySids" : []
- }
- },
- "of:0000000000000192" : {
- "segmentrouting" : {
- "name" : "Spine-R2",
- "nodeSid" : 104,
- "routerIp" : "192.168.0.22",
- "routerMac" : "00:00:01:00:22:80",
- "isEdgeRouter" : false,
- "adjacencySids" : []
- }
- }
- },
- "hosts" : {
- "00:00:00:00:00:01/-1" : {
- "basic": {
- "ips": ["10.6.1.1"],
- "location": "of:0000000000000001/1"
- }
- },
- "00:00:00:00:00:02/-1" : {
- "basic": {
- "ips": ["10.6.1.2"],
- "location": "of:0000000000000001/2"
- }
- },
- "00:00:00:00:00:03/-1" : {
- "basic": {
- "ips": ["10.6.2.1"],
- "location": "of:0000000000000002/3"
- }
- },
- "00:00:00:00:00:04/-1" : {
- "basic": {
- "ips": ["10.6.2.2"],
- "location": "of:0000000000000002/4"
- }
- }
- }
-}
+{}
\ No newline at end of file
diff --git a/roles/cord-profile/templates/volt-devices.yaml.j2 b/roles/cord-profile/templates/volt-devices.yaml.j2
deleted file mode 100644
index ec882c9..0000000
--- a/roles/cord-profile/templates/volt-devices.yaml.j2
+++ /dev/null
@@ -1,46 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: created by platform-install/roles/cord-profile/templates/volt-devices.yaml.j2
-
-imports:
- - custom_types/xos.yaml
-
-topology_template:
- node_templates:
-
-# vOLT service defined in services.yaml
- service#volt:
- type: tosca.nodes.VOLTService
- properties:
- no-create: True
- no-delete: True
- no-update: True
-
-# vOLT devices
-{% for device in volt_devices %}
- {{ device.name }}-{{ device.index | default(loop.index) }}:
- type: tosca.nodes.VOLTDevice
- properties:
- driver: {{ device.driver | default("pmc-olt") }}
- openflow_id: {{ device.openflow_id }}
- access_devices: {{ device.access_devices }}
- requirements:
- - volt_service:
- node: service#volt
- relationship: tosca.relationships.MemberOfService
- - access_agent:
- node: {{ device.name }}-agent-{{ device.index | default(loop.index) }}
- relationship: tosca.relationships.UsesAgent
-
- {{ device.name }}-agent-{{ device.index | default(loop.index) }}:
- type: tosca.nodes.AccessAgent
- properties:
- mac: {{ device.agent_mac }}
- port_mappings: {{ device.agent_port_mappings }}
- requirements:
- - volt_service:
- node: service#volt
- relationship: tosca.relationships.MemberOfService
-
-{% endfor %}
-
diff --git a/roles/cord-profile/templates/vrouter.yaml.j2 b/roles/cord-profile/templates/vrouter.yaml.j2
index cf53513..6931c01 100644
--- a/roles/cord-profile/templates/vrouter.yaml.j2
+++ b/roles/cord-profile/templates/vrouter.yaml.j2
@@ -1,6 +1,6 @@
tosca_definitions_version: tosca_simple_yaml_1_0
-description: Just enough Tosca to get the vSG slice running on the CORD POD
+description: Onboard the vRouter service
imports:
- custom_types/xos.yaml
@@ -19,156 +19,3 @@
rest_port: 8181
rest_user: onos
rest_pass: rocks
-
- device#of:00000000000000b1:
- type: tosca.nodes.VRouterDevice
- properties:
- openflow_id: of:00000000000000b1
- driver: softrouter
- # config_key: basic
- requirements:
- - service#vrouter:
- node: service#vrouter
- relationship: tosca.relationships.MemberOfService
-
- # Port 1
- port#port1/1:
- type: tosca.nodes.VRouterPort
- properties:
- openflow_id: of:00000000000000b1/1
- requirements:
- - device#of:00000000000000b1:
- node: device#of:00000000000000b1
- relationship: tosca.relationships.PortOfDevice
- - service#vrouter:
- node: service#vrouter
- relationship: tosca.relationships.MemberOfService
-
- interface#b1-1:
- type: tosca.nodes.VRouterInterface
- properties:
- name: b1-1
- mac: 00:00:00:00:00:01
- requirements:
- - port#port1/1:
- node: port#port1/1
- relationship: tosca.relationships.InterfaceOfPort
-
- ips#10.0.1.2/24:
- type: tosca.nodes.VRouterIp
- properties:
- ip: 10.0.1.2/24
- requirements:
- - interface#b1-1:
- node: interface#b1-1
- relationship: tosca.relationships.IpOfInterface
-
- # Port 2
- port#port1/2:
- type: tosca.nodes.VRouterPort
- properties:
- openflow_id: of:00000000000000b1/2
- requirements:
- - device#of:00000000000000b1:
- node: device#of:00000000000000b1
- relationship: tosca.relationships.PortOfDevice
- - service#vrouter:
- node: service#vrouter
- relationship: tosca.relationships.MemberOfService
-
- interface#b1-2:
- type: tosca.nodes.VRouterInterface
- properties:
- name: b1-2
- mac: 00:00:00:00:00:01
- requirements:
- - port#port1/2:
- node: port#port1/2
- relationship: tosca.relationships.InterfaceOfPort
-
- ips#10.0.2.2/24:
- type: tosca.nodes.VRouterIp
- properties:
- ip: 10.0.2.2/24
- requirements:
- - interface#b1-1:
- node: interface#b1-2
- relationship: tosca.relationships.IpOfInterface
-
- # Port 3
- port#port1/3:
- type: tosca.nodes.VRouterPort
- properties:
- openflow_id: of:00000000000000b1/3
- requirements:
- - device#of:00000000000000b1:
- node: device#of:00000000000000b1
- relationship: tosca.relationships.PortOfDevice
- - service#vrouter:
- node: service#vrouter
- relationship: tosca.relationships.MemberOfService
-
- interface#b1-3:
- type: tosca.nodes.VRouterInterface
- properties:
- name: b1-3
- mac: 00:00:00:00:00:01
- requirements:
- - port#port1/3:
- node: port#port1/3
- relationship: tosca.relationships.InterfaceOfPort
-
- ips#10.0.3.2/24:
- type: tosca.nodes.VRouterIp
- properties:
- ip: 10.0.3.2/24
- requirements:
- - interface#b1-1:
- node: interface#b1-3
- relationship: tosca.relationships.IpOfInterface
-
- # Port 4
- port#port1/4:
- type: tosca.nodes.VRouterPort
- properties:
- openflow_id: of:00000000000000b1/4
- requirements:
- - device#of:00000000000000b1:
- node: device#of:00000000000000b1
- relationship: tosca.relationships.PortOfDevice
- - service#vrouter:
- node: service#vrouter
- relationship: tosca.relationships.MemberOfService
-
- interface#b1-4:
- type: tosca.nodes.VRouterInterface
- properties:
- name: b1-4
- mac: 00:00:00:00:00:01
- vlan: 100
- requirements:
- - port#port1/4:
- node: port#port1/4
- relationship: tosca.relationships.InterfaceOfPort
-
- ips#10.0.4.2/24:
- type: tosca.nodes.VRouterIp
- properties:
- ip: 10.0.4.2/24
- requirements:
- - interface#b1-1:
- node: interface#b1-4
- relationship: tosca.relationships.IpOfInterface
-
- app#vrouterApp:
- type: tosca.nodes.VRouterApp
- properties:
- name: org.onosproject.router
- # can we use a relation to specify the connect point port?
- control_plane_connect_point: of:00000000000000b1/5
- ospf_enabled: true
- requirements:
- - service#vrouter:
- node: service#vrouter
- relationship: tosca.relationships.MemberOfService
-