make ipv4_shared the default network method, rename None to nonetwork
smbaker [Tue, 23 Apr 2013 21:06:59 +0000 (14:06 -0700)]
apps/gacks/bridgeconfig.py
apps/gacksadmin/user_network.php

index c1cd572..a85f002 100644 (file)
@@ -325,7 +325,7 @@ class NetworkBuilder_default(NetworkBuilder):
         ipList = ",".join(ipList)
         self.set_tag("vsys_ipList", None, ipList)
 
-        self.set_network_method(None)
+        self.set_network_method("nonetwork")
         self.clear_tags("slice_hostmap")
         self.clear_tags("slice_bridge_name")
         self.clear_tags("slice_bridge_addr")
@@ -342,12 +342,13 @@ def AutoConfig(plc, slice, options={}):
 
     if network_method == "gre":
         NetworkBuilder_gre(plc, slice).configure_slice()
-    elif network_method == "ipv4_shared":
-        NetworkBuilder_IPv4_shared(plc, slice).configure_slice()
     elif network_method == "ipv6_shared":
         NetworkBuilder_IPv6_shared(plc, slice).configure_slice()
-    else:
+    elif network_method == "nonetwork":
         NetworkBuilder_default(plc, slice).configure_slice()
+    else:     # if network_method == "ipv4_shared":
+        # default to ipv4_shared
+        NetworkBuilder_IPv4_shared(plc, slice).configure_slice()
 
 
 
index 4abe01d..b7c2f13 100644 (file)
@@ -48,14 +48,14 @@ if ($account_name != NULL) {
     $wizard_config = $api->SliceGetConfig($account_name);
     $network_method = $wizard_config["network_method"];
     if (!$network_method) {
-        $network_method = "";
+        $network_method = "ipv4_shared";
     }
 
     $network_selectors = array();
-    $network_selectors []= array("display"=>"Default - No Private Network", "value"=>"");
-    $network_selectors []= array("display"=>"Private Bridge with GRE Tunnels", "value"=>"gre");
-    $network_selectors []= array("display"=>"IPv4 partitioned shared 10.x.x.x", "value"=>"ipv4_shared");
+    $network_selectors []= array("display"=>"(default) IPv4 partitioned shared 10.x.x.x", "value"=>"ipv4_shared");
     $network_selectors []= array("display"=>"IPv6 partitioned shared fec0::", "value"=>"ipv6_shared");
+    $network_selectors []= array("display"=>"Private Bridge with GRE Tunnels", "value"=>"gre");
+    $network_selectors []= array("display"=>"No Private Network", "value"=>"nonetwork");
     select_selector($network_method, $network_selectors);
 
     $form = new PlekitForm(l_gacks_actions(), array("action"=>"set-network",