← Back to branch summary

~smoser/nova/milestone-proposed.lp853330

« back to all changes in this revision

Viewing changes to nova/network/linux_net.py

  • Committer: Tarmac
  • Author(s): Vishvananda Ishaya
  • Date: 2011-09-19 20:29:19 UTC
  • mfrom: (1130.417.4 lp852771)
  • Revision ID: tarmac-20110919202919-di7osv0jxogq7dpw
Adds an optional flag to force dhcp releases on instance termination. This allows ips to be reused without having to wait for the lease to timeout.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/network/linux_net.py
540
540
    return '\n'.join(hosts)
541
541
 
542
542
 
 
543
def release_dhcp(dev, address, mac_address):
 
544
    utils.execute('dhcp_release', dev, address, mac_address, run_as_root=True)
 
545
 
 
546
 
543
547
# NOTE(ja): Sending a HUP only reloads the hostfile, so any
544
548
#           configuration options (like dchp-range, vlan, ...)
545
549
#           aren't reloaded.
790
794
    return interface_driver.unplug(network)
791
795
 
792
796
 
 
797
def get_dev(network):
 
798
    return interface_driver.get_dev(network)
 
799
 
 
800
 
793
801
class LinuxNetInterfaceDriver(object):
794
802
    """Abstract class that defines generic network host API"""
795
803
    """ for for all Linux interface drivers."""
802
810
        """Destory Linux device, return device name"""
803
811
        raise NotImplementedError()
804
812
 
 
813
    def get_dev(self, network):
 
814
        """Get device name"""
 
815
        raise NotImplementedError()
 
816
 
 
817
 
805
818
 
806
819
# plugs interfaces using Linux Bridge
807
820
class LinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver):
823
836
        return network['bridge']
824
837
 
825
838
    def unplug(self, network):
 
839
        return self.get_dev(network)
 
840
 
 
841
    def get_dev(self, network):
826
842
        return network['bridge']
827
843
 
828
844
    @classmethod
947
963
        return dev
948
964
 
949
965
    def unplug(self, network):
 
966
        return self.get_dev(network)
 
967
 
 
968
    def get_dev(self, network):
950
969
        dev = "gw-" + str(network['id'])
951
970
        return dev
952
971