홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Claudine Chiu
Committed by Gerrit Code Review
cc5f03e8 1 parent 1bce6fbc

ONOS-2184 - virtual network Intents for vnet STC. 

Change-Id: Ic6b15ba20b45cae36ec873808641f7a1b9c9aa8c
Inline Side-by-side
Showing 3 changed files with 29 additions and 8 deletions
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
16 <scenario name="net-setup-vnets" description="Network (vnets) setup steps"> 16 <scenario name="net-setup-vnets" description="Network (vnets) setup steps">
17 <group name="Net-Setup-Vnets"> 17 <group name="Net-Setup-Vnets">
18 18
19 - <step name="Get-TenantId" requires="^" unless="${tenantId}" 19 + <step name="Get-TenantId" unless="${tenantId}"
20 exec="echo @stc tenantId=TestTenant"/> 20 exec="echo @stc tenantId=TestTenant"/>
21 21
22 - <step name="Create-Tenant" requires="^" 22 + <step name="Create-Tenant" requires="~Get-TenantId"
23 exec="onos ${OCI} vnet-add-tenant ${tenantId}"/> 23 exec="onos ${OCI} vnet-add-tenant ${tenantId}"/>
24 24
25 <step name="Query-Tenant" requires="^" 25 <step name="Query-Tenant" requires="^"
...@@ -46,8 +46,17 @@ ...@@ -46,8 +46,17 @@
46 <step name="Create-Bidirectional-Link" requires="^" 46 <step name="Create-Bidirectional-Link" requires="^"
47 exec="onos -f ${OCI} vnet-create-link --bidirectional ${networkId} device2 2 device1 1"/> 47 exec="onos -f ${OCI} vnet-create-link --bidirectional ${networkId} device2 2 device1 1"/>
48 48
49 - <step name="Check-intents-installed" requires="^" 49 + <step name="Create-Intent-1" requires="^"
50 - exec="onos-check-intent ${OCI} networkId=${networkId} INSTALLED 2"/> 50 + exec="onos -f ${OCI} add-vnet-intent --key 21 --encapsulation VLAN ${networkId} device2/2 device1/1"/>
51 +
52 + <step name="Check-intents-installed-1" requires="^"
53 + exec="onos-check-intent ${OCI} 21 INSTALLED 1"/>
54 +
55 + <step name="Create-Intent-2" requires="^"
56 + exec="onos -f ${OCI} add-vnet-intent --key 12 --encapsulation VLAN ${networkId} device1/1 device2/2"/>
57 +
58 + <step name="Check-intents-installed-2" requires="^"
59 + exec="onos-check-intent ${OCI} 12 INSTALLED 1"/>
51 60
52 <step name="Ping-hosts-1" requires="^" 61 <step name="Ping-hosts-1" requires="^"
53 exec="onos-mininet sendAndExpect h4 ping -c1 h9 --expect \ 0% packet loss"/> 62 exec="onos-mininet sendAndExpect h4 ping -c1 h9 --expect \ 0% packet loss"/>
......
...@@ -19,15 +19,24 @@ ...@@ -19,15 +19,24 @@
19 <step name="Check-NetworkId-Variable-Exists" 19 <step name="Check-NetworkId-Variable-Exists"
20 exec="test '${networkId}' != ''"/> 20 exec="test '${networkId}' != ''"/>
21 21
22 + <step name="Remove-Intent-1" requires="^"
23 + exec="onos -f ${OCI} remove-vnet-intent -p ${networkId} org.onosproject.cli 21"/>
24 +
25 + <step name="Check-intents-removed-1" requires="^"
26 + exec="onos-check-intent ${OCI} 21 WITHDRAWN 1"/>
27 +
28 + <step name="Remove-Intent-2" requires="^"
29 + exec="onos -f ${OCI} remove-vnet-intent -p ${networkId} org.onosproject.cli 12"/>
30 +
31 + <step name="Check-intents-removed-2" requires="^"
32 + exec="onos-check-intent ${OCI} 12 WITHDRAWN 1"/>
33 +
22 <step name="Check-Vnet-Link" requires="^" 34 <step name="Check-Vnet-Link" requires="^"
23 exec="onos ${OCI} vnet-links ${networkId}"/> 35 exec="onos ${OCI} vnet-links ${networkId}"/>
24 36
25 <step name="Remove-Bidirectional-Link" requires="^" 37 <step name="Remove-Bidirectional-Link" requires="^"
26 exec="onos -f ${OCI} vnet-remove-link --bidirectional ${networkId} device2 2 device1 1"/> 38 exec="onos -f ${OCI} vnet-remove-link --bidirectional ${networkId} device2 2 device1 1"/>
27 39
28 - <step name="Check-intents-removed" requires="^"
29 - exec="onos-check-intent ${OCI} networkId=${networkId} IGNORE_STATE 0"/>
30 -
31 <step name="Ping-hosts-2" requires="^" 40 <step name="Ping-hosts-2" requires="^"
32 exec="onos-mininet sendAndExpect h4 ping -c1 h9 --expect \ 100% packet loss"/> 41 exec="onos-mininet sendAndExpect h4 ping -c1 h9 --expect \ 100% packet loss"/>
33 42
......
...@@ -17,8 +17,11 @@ ...@@ -17,8 +17,11 @@
17 17
18 <import file="${ONOS_SCENARIOS}/net-setup.xml"/> 18 <import file="${ONOS_SCENARIOS}/net-setup.xml"/>
19 19
20 + <import file="${ONOS_SCENARIOS}/net-reactive-fwd.xml"/>
21 + <dependency name="Net-Reactive-Fwd" requires="Net-Setup"/>
22 +
20 <import file="${ONOS_SCENARIOS}/net-setup-vnets.xml"/> 23 <import file="${ONOS_SCENARIOS}/net-setup-vnets.xml"/>
21 - <dependency name="Net-Setup-Vnets" requires="Net-Setup"/> 24 + <dependency name="Net-Setup-Vnets" requires="Net-Reactive-Fwd"/>
22 25
23 <import file="${ONOS_SCENARIOS}/net-teardown-vnets.xml"/> 26 <import file="${ONOS_SCENARIOS}/net-teardown-vnets.xml"/>
24 <dependency name="Net-Teardown-Vnets" requires="Net-Setup-Vnets"/> 27 <dependency name="Net-Teardown-Vnets" requires="Net-Setup-Vnets"/>
......