Remove unused network.default_{gateway,netmask}.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

tools/python/xen/xend/XendAPI.py

@@ -824,18 +824,13 @@ class XendAPI(object):
 
     network_attr_ro = ['VIFs', 'PIFs']
     network_attr_rw = ['name_label',
-                       'name_description',
-                       'default_gateway',
-                       'default_netmask']
+                       'name_description']
     
     network_funcs = [('create', 'network')]
     
-    def network_create(self, _, name_label, name_description,
-                       default_gateway, default_netmask):
+    def network_create(self, _, name_label, name_description):
         return xen_api_success(
-            XendNode.instance().network_create(name_label, name_description,
-                                               default_gateway,
-                                               default_netmask))
+            XendNode.instance().network_create(name_label, name_description))
 
     def network_destroy(self, _, ref):
         return xen_api_success(XendNode.instance().network_destroy(ref))
@@ -856,12 +851,6 @@ class XendAPI(object):
     def network_get_name_description(self, _, ref):
         return xen_api_success(self._get_network(ref).name_description)
 
-    def network_get_default_gateway(self, _, ref):
-        return xen_api_success(self._get_network(ref).default_gateway)
-
-    def network_get_default_netmask(self, _, ref):
-        return xen_api_success(self._get_network(ref).default_netmask)
-
     def network_get_VIFs(self, _, ref):
         return xen_api_success(self._get_network(ref).get_VIF_UUIDs())
 
@@ -874,13 +863,6 @@ class XendAPI(object):
     def network_set_name_description(self, _, ref, val):
         return xen_api_success(self._get_network(ref).set_name_description(val))
 
-    def network_set_default_gateway(self, _, ref, val):
-        return xen_api_success(self._get_network(ref).set_default_gateway(val))
-
-    def network_set_default_netmask(self, _, ref, val):
-        return xen_api_success(self._get_network(ref).set_default_netmask(val))
-
-
     # Xen API: Class PIF
     # ----------------------------------------------------------------
 

tools/python/xen/xend/XendNetwork.py

@@ -27,43 +27,11 @@ from XendLogging import log
 
 IP_ROUTE_RE = r'^default via ([\d\.]+) dev (\w+)'
 
-def linux_get_default_network():
-    """Returns the network details of the host."""
-
-    ip_cmd = '/sbin/ip route'
-    rc, output = commands.getstatusoutput(ip_cmd)
-    default_route = None
-    default_dev = None
-    default_netmask = None
-    if rc == 0:
-        # find default route/device
-        for line in output.split('\n'):
-            is_default = re.search(IP_ROUTE_RE, line)
-            if is_default:
-                default_route = is_default.group(1)
-                default_dev = is_default.group(2)
-
-        # find network address and network mask
-        if default_dev:
-            dev_re = r'^([\d\.]+)/(\d+) dev %s' % default_dev
-            for line in output.split('\n'):
-                is_dev = re.search(dev_re, line)
-                if is_dev:
-                    # convert integer netmask to string representation
-                    netmask = 0xffffffff ^ (2**(32-int(is_dev.group(2))) - 1)
-                    packed = struct.pack('!I', netmask)
-                    default_netmask = socket.inet_ntoa(packed)
-
-    return (default_route, default_netmask)
-
-
 class XendNetwork:
-    def __init__(self, uuid, name, description, gateway, netmask):
+    def __init__(self, uuid, name, description):
         self.uuid = uuid
         self.name_label = name 
         self.name_description = description
-        self.default_gateway = gateway
-        self.default_netmask = netmask
 
     def set_name_label(self, new_name):
         self.name_label = new_name
@@ -73,16 +41,6 @@ class XendNetwork:
         self.name_description = new_desc
         XendNode.instance().save_networks()
 
-    def set_default_gateway(self, new_gateway):
-        if re.search('^\d+\.\d+\.\d+\.\d+$', new_gateway):
-            self.default_gateway = new_gateway
-            XendNode.instance().save_networks()
-
-    def set_default_netmask(self, new_netmask):
-        if re.search('^\d+\.\d+\.\d+\.\d+$', new_netmask):
-            self.default_netmask = new_netmask
-            XendNode.instance().save_networks()
-
     def get_VIF_UUIDs(self):
         result = []
         vms = XendDomain.instance().get_all_vms()
@@ -103,8 +61,6 @@ class XendNetwork:
             'uuid': self.uuid,
             'name_label': self.name_label,
             'name_description': self.name_description,
-            'default_gateway': self.default_gateway,
-            'default_netmask': self.default_netmask,
         }
         if transient:
             result['VIFs'] = self.get_VIF_UUIDs()

tools/python/xen/xend/XendNode.py

@@ -109,12 +109,9 @@ class XendNode:
             for net_uuid, network in saved_networks.items():
                 self.network_create(network.get('name_label'),
                                     network.get('name_description', ''),
-                                    network.get('default_gateway', ''),
-                                    network.get('default_netmask', ''),
                                     False, net_uuid)
         else:
-            gateway, netmask = linux_get_default_network()
-            self.network_create('net0', '', gateway, netmask, False)
+            self.network_create('net0', '', False)
 
         # initialise PIFs
         saved_pifs = self.state_store.load_state('pif')
@@ -168,15 +165,12 @@ class XendNode:
 
 
 
-    def network_create(self, name_label, name_description,
-                       default_gateway, default_netmask, persist = True,
+    def network_create(self, name_label, name_description, persist = True,
                        net_uuid = None):
         if net_uuid is None:
             net_uuid = uuid.createString()
         self.networks[net_uuid] = XendNetwork(net_uuid, name_label,
-                                              name_description,
-                                              default_gateway,
-                                              default_netmask)
+                                              name_description)
         if persist:
             self.save_networks()
         return net_uuid