| commit | baf7106f585699a208b4c49d69e50dfd0a786c3d | [log] [tgz] |
|---|---|---|
| author | GlennRC <glenn@onlab.us> | Wed Dec 16 23:51:55 2015 +0000 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Wed Dec 16 23:51:55 2015 +0000 |
| tree | d2ce39345a17112116e9bf0f755c61044cb8faff | |
| parent | 331b9236cc17cb01fbb7c5c7f9070a529b191cc9 [diff] | |
| parent | fa65fce68ffebfa96cf26d63043f07bb6aae3152 [diff] |
Merge "Stripped flow before comparison"
diff --git a/TestON/tests/USECASE_SdnipFunctionCluster_fsfw/Dependency/fsfw.xml b/TestON/tests/USECASE_SdnipFunctionCluster_fsfw/Dependency/fsfw.xml index 4700483..6c02b45 100644 --- a/TestON/tests/USECASE_SdnipFunctionCluster_fsfw/Dependency/fsfw.xml +++ b/TestON/tests/USECASE_SdnipFunctionCluster_fsfw/Dependency/fsfw.xml
@@ -160,7 +160,7 @@ <range start="2511" end="2511"/> </port> </switch> - <controller ip_address="10.128.20.11" ssl="false" port="6633"/> + <controller ip_address="10.128.20.111" ssl="false" port="6633"/> </slice> <slice name="P10-ONOS-demo2"> <switch name="sw13" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true"> @@ -336,7 +336,7 @@ <range start="2511" end="2511"/> </port> </switch> - <controller ip_address="10.128.20.12" ssl="false" port="6633"/> + <controller ip_address="10.128.20.112" ssl="false" port="6633"/> </slice> <slice name="P10-ONOS-demo3"> <switch name="sw29" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true"> @@ -439,7 +439,7 @@ <range start="2511" end="2511"/> </port> </switch> - <controller ip_address="10.128.20.13" ssl="false" port="6633"/> + <controller ip_address="10.128.20.113" ssl="false" port="6633"/> </slice> </flowspace_firewall> \ No newline at end of file
diff --git a/TestON/tests/USECASE_SdnipFunctionCluster_fsfw/vrrpd-onos1.sh b/TestON/tests/USECASE_SdnipFunctionCluster_fsfw/Dependency/vrrpd-onos1.sh similarity index 100% rename from TestON/tests/USECASE_SdnipFunctionCluster_fsfw/vrrpd-onos1.sh rename to TestON/tests/USECASE_SdnipFunctionCluster_fsfw/Dependency/vrrpd-onos1.sh
diff --git a/TestON/tests/USECASE_SdnipFunctionCluster_fsfw/vrrpd-onos2.sh b/TestON/tests/USECASE_SdnipFunctionCluster_fsfw/Dependency/vrrpd-onos2.sh similarity index 100% rename from TestON/tests/USECASE_SdnipFunctionCluster_fsfw/vrrpd-onos2.sh rename to TestON/tests/USECASE_SdnipFunctionCluster_fsfw/Dependency/vrrpd-onos2.sh
diff --git a/TestON/tests/USECASE_SdnipFunctionCluster_fsfw/vrrpd-onos3.sh b/TestON/tests/USECASE_SdnipFunctionCluster_fsfw/Dependency/vrrpd-onos3.sh similarity index 100% rename from TestON/tests/USECASE_SdnipFunctionCluster_fsfw/vrrpd-onos3.sh rename to TestON/tests/USECASE_SdnipFunctionCluster_fsfw/Dependency/vrrpd-onos3.sh
diff --git a/TestON/tests/USECASE_SdnipFunctionCluster_fsfw/USECASE_SdnipFunctionCluster_fsfw.params b/TestON/tests/USECASE_SdnipFunctionCluster_fsfw/USECASE_SdnipFunctionCluster_fsfw.params index 2a5f0c2..d0d6eff 100644 --- a/TestON/tests/USECASE_SdnipFunctionCluster_fsfw/USECASE_SdnipFunctionCluster_fsfw.params +++ b/TestON/tests/USECASE_SdnipFunctionCluster_fsfw/USECASE_SdnipFunctionCluster_fsfw.params
@@ -37,9 +37,9 @@ <config> <peerNum> 3 </peerNum> <switchNum> 39 </switchNum> - <peer64514> 10.0.14.1</peer64514> - <peer64515> 10.0.15.1</peer64515> - <peer64516> 10.0.16.1</peer64516> + <pr64514> 10.0.14.1</pr64514> + <pr64515> 10.0.15.1</pr64515> + <pr64516> 10.0.16.1</pr64516> </config> <timers>