SEBA-401: Reformat and expand descriptions in fabric xproto
Change-Id: I994a46b57570f0a52d034221803b223281395ffa
diff --git a/samples/fabric-config.yaml b/samples/fabric-config.yaml
index 63ba218..e82db0f 100644
--- a/samples/fabric-config.yaml
+++ b/samples/fabric-config.yaml
@@ -19,6 +19,7 @@
- custom_types/switch.yaml
- custom_types/switchport.yaml
- custom_types/portinterface.yaml
+ - custom_types/fabricipaddress.yaml
description: Configures fabric switches and related ports
topology_template:
node_templates:
@@ -47,13 +48,23 @@
interface#interface1:
type: tosca.nodes.PortInterface
properties:
- ips: 192.168.0.254/24
name: port1
requirements:
- port:
node: port#port1
relationship: tosca.relationships.BelongsToOne
+ # Setup a fabric switch port interface
+ ipaddress#ipaddress1:
+ type: tosca.nodes.FabricIpAddress
+ properties:
+ ip: 192.168.0.254/24
+ description: some ip address
+ requirements:
+ - interface:
+ node: interface#interface1
+ relationship: tosca.relationships.BelongsToOne
+
# Setup a fabric switch port with host_learning disabled
port#port2:
type: tosca.nodes.SwitchPort
diff --git a/samples/service.yaml b/samples/service.yaml
index a6869ec..d35803e 100644
--- a/samples/service.yaml
+++ b/samples/service.yaml
@@ -28,7 +28,7 @@
type: tosca.nodes.ONOSService
properties:
name: ONOS_Fabric
- kind: platform
+ kind: data
rest_hostname: onos-fabric-ui
rest_port: 8181
@@ -36,12 +36,12 @@
type: tosca.nodes.FabricService
properties:
name: fabric
- kind: platform
+ kind: data
service_dependency#onos-fabric_fabric:
type: tosca.nodes.ServiceDependency
properties:
- connect_method: None
+ connect_method: none
requirements:
- subscriber_service:
node: service#fabric