Merge pull request #248 from illfelder/development

Remove the config for default ethernet interface.

4 files changed, 7 insertions, 12 deletions

diff --git a/google_compute_engine/instance_setup/instance_config.py b/google_compute_engine/instance_setup/instance_config.py
index b7f7cf6..5ade977 100644
--- a/google_compute_engine/instance_setup/instance_config.py
+++ b/google_compute_engine/instance_setup/instance_config.py
@@ -57,7 +57,6 @@ class InstanceConfig(config_manager.ConfigManager):
           'set_multiqueue': 'true',
       },
       'IpForwarding': {
-          'ethernet_interface': '',
           'ethernet_proto_id': '66',
       },
       'MetadataScripts': {
diff --git a/google_compute_engine/ip_forwarding/ip_forwarding_daemon.py b/google_compute_engine/ip_forwarding/ip_forwarding_daemon.py
index 00e3f3a..6bbf48e 100755
--- a/google_compute_engine/ip_forwarding/ip_forwarding_daemon.py
+++ b/google_compute_engine/ip_forwarding/ip_forwarding_daemon.py
@@ -42,18 +42,17 @@ class IpForwardingDaemon(object):
 
   forwarded_ips = 'instance/network-interfaces/0/forwarded-ips'
 
-  def __init__(self, interface=None, proto_id=None):
+  def __init__(self, proto_id=None):
     """Constructor.
 
     Args:
-      interface: string, the output device to use.
       proto_id: string, the routing protocol identifier for Google IP changes.
     """
     facility = logging.handlers.SysLogHandler.LOG_DAEMON
     self.logger = logger.Logger(name='google-ip-forwarding', facility=facility)
     self.watcher = metadata_watcher.MetadataWatcher(logger=self.logger)
     self.utils = ip_forwarding_utils.IpForwardingUtils(
-        logger=self.logger, interface=interface, proto_id=proto_id)
+        logger=self.logger, proto_id=proto_id)
     try:
       with file_utils.LockFile(LOCKFILE):
         self.logger.info('Starting Google IP Forwarding daemon.')
@@ -115,8 +114,6 @@ def main():
   instance_config = config_manager.ConfigManager()
   if instance_config.GetOptionBool('Daemons', 'ip_forwarding_daemon'):
     IpForwardingDaemon(
-        interface=instance_config.GetOptionString(
-            'IpForwarding', 'ethernet_interface'),
         proto_id=instance_config.GetOptionString(
             'IpForwarding', 'ethernet_proto_id'))
 
diff --git a/google_compute_engine/ip_forwarding/ip_forwarding_utils.py b/google_compute_engine/ip_forwarding/ip_forwarding_utils.py
index 6e206b5..dee62f1 100644
--- a/google_compute_engine/ip_forwarding/ip_forwarding_utils.py
+++ b/google_compute_engine/ip_forwarding/ip_forwarding_utils.py
@@ -24,17 +24,16 @@ IP_REGEX = re.compile(r'\A(\d{1,3}\.){3}\d{1,3}\Z')
 class IpForwardingUtils(object):
   """System IP address configuration utilities."""
 
-  def __init__(self, logger, interface=None, proto_id=None):
+  def __init__(self, logger, proto_id=None):
     """Constructor.
 
     Args:
       logger: logger object, used to write to SysLog and serial port.
-      interface: string, the output device to use.
       proto_id: string, the routing protocol identifier for Google IP changes.
     """
     self.logger = logger
     self.options = {
-        'dev': interface or self._GetDefaultInterface(),
+        'dev': self._GetDefaultInterface(),
         'proto': proto_id or '66',
         'scope': 'host',
     }
diff --git a/google_compute_engine/ip_forwarding/tests/ip_forwarding_daemon_test.py b/google_compute_engine/ip_forwarding/tests/ip_forwarding_daemon_test.py
index b41766e..44ae954 100644
--- a/google_compute_engine/ip_forwarding/tests/ip_forwarding_daemon_test.py
+++ b/google_compute_engine/ip_forwarding/tests/ip_forwarding_daemon_test.py
@@ -50,12 +50,12 @@ class IpForwardingDaemonTest(unittest.TestCase):
     with mock.patch.object(
         ip_forwarding_daemon.IpForwardingDaemon,
         'HandleForwardedIps') as mock_handle:
-      ip_forwarding_daemon.IpForwardingDaemon(interface='eth0', proto_id='66')
+      ip_forwarding_daemon.IpForwardingDaemon(proto_id='66')
       expected_calls = [
           mock.call.logger.Logger(name=mock.ANY, facility=mock.ANY),
           mock.call.watcher.MetadataWatcher(logger=mock_logger_instance),
           mock.call.utils.IpForwardingUtils(
-              logger=mock_logger_instance, interface='eth0', proto_id='66'),
+              logger=mock_logger_instance, proto_id='66'),
           mock.call.lock.LockFile(ip_forwarding_daemon.LOCKFILE),
           mock.call.lock.LockFile().__enter__(),
           mock.call.logger.Logger().info(mock.ANY),
@@ -86,7 +86,7 @@ class IpForwardingDaemonTest(unittest.TestCase):
           mock.call.logger.Logger(name=mock.ANY, facility=mock.ANY),
           mock.call.watcher.MetadataWatcher(logger=mock_logger_instance),
           mock.call.utils.IpForwardingUtils(
-              logger=mock_logger_instance, interface=None, proto_id=None),
+              logger=mock_logger_instance, proto_id=None),
           mock.call.lock.LockFile(ip_forwarding_daemon.LOCKFILE),
           mock.call.logger.Logger().warning('Test Error'),
       ]