Make sure we test mode where we never reuse the nics we boot from.

rochfordk · May 13, 2013 · 26b70d9 · 26b70d9
1 parent 93b76f6
commit 26b70d9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/test_framework/network-team.json b/test_framework/network-team.json
@@ -60,15 +60,15 @@
           "pattern": "team/.*/.*",
           "conduit_list": { 
             "intf0": {
-              "if_list": [ "1g1", "1g2" ],
+              "if_list": [ "1g2", "1g3" ],
               "team_mode": 5
             },
             "intf1": {
-              "if_list": [ "1g1", "1g2" ],
+              "if_list": [ "1g2", "1g3" ],
               "team_mode": 5
             },
             "intf2": {
-              "if_list": [ "1g1", "1g2" ],
+              "if_list": [ "1g2", "1g3" ],
               "team_mode": 5
             }
           }
@@ -77,55 +77,55 @@
           "pattern": "dual/.*/.*",
           "conduit_list": { 
             "intf0": {
-              "if_list": [ "1g1" ]
+              "if_list": [ "1g2" ]
             },
             "intf1": {
-              "if_list": [ "1g2" ]
+              "if_list": [ "1g3" ]
             },
             "intf2": {
-              "if_list": [ "1g1" ]
+              "if_list": [ "1g2" ]
             }
           }
         },
         {
           "pattern": "single/.*/.*",
           "conduit_list": { 
             "intf0": {
-              "if_list": [ "1g1" ]
+              "if_list": [ "1g2" ]
             },
             "intf1": {
-              "if_list": [ "1g1" ]
+              "if_list": [ "1g2" ]
             },
             "intf2": {
-              "if_list": [ "1g1" ]
+              "if_list": [ "1g2" ]
             }
           }
         },
         {
           "pattern": ".*/.*/.*",
           "conduit_list": { 
             "intf0": {
-              "if_list": [ "1g1" ]
+              "if_list": [ "1g2" ]
             },
             "intf1": {
-              "if_list": [ "1g1" ]
+              "if_list": [ "1g2" ]
             },
             "intf2": {
-              "if_list": [ "1g1" ]
+              "if_list": [ "1g2" ]
             }
           }
         },
         {
           "pattern": "mode/1g_adpt_count/role",
           "conduit_list": { 
             "intf0": {
-              "if_list": [ "1g1" ]
+              "if_list": [ "1g2" ]
             },
             "intf1": {
-              "if_list": [ "1g1" ]
+              "if_list": [ "1g2" ]
             },
             "intf2": {
-              "if_list": [ "1g1" ]
+              "if_list": [ "1g2" ]
             }
           }
         }
@@ -246,4 +246,3 @@
     }
   }
 }
-
diff --git a/test_lib.sh b/test_lib.sh
@@ -75,7 +75,7 @@ export CROWBAR_KEY="crowbar:crowbar"
 # Please keep it at 4 characters or less.
 SMOKETEST_BRIDGES=(crowbar-pub)
 
-NICS_PER_BRIDGE=2
+NICS_PER_BRIDGE=3
 
 # An array of physical interfaces and the bridges they should be bound to.
 # We need to use real physical interfaces becasue Crowbar assumes