update testsvm_rename

3 files changed, 22 insertions, 17 deletions

diff --git a/packages/python-google-compute-engine/google_compute_engine/networking/network_daemon.py b/packages/python-google-compute-engine/google_compute_engine/networking/network_daemon.py
index 89af61e..d8dcd07 100644
--- a/packages/python-google-compute-engine/google_compute_engine/networking/network_daemon.py
+++ b/packages/python-google-compute-engine/google_compute_engine/networking/network_daemon.py
@@ -108,8 +108,8 @@ class NetworkDaemon(object):
         self.ip_forwarding.HandleForwardedIps(interface.name,
                                               interface.forwarded_ips,
                                               interface.ip)
-    if socket.gethostname() != result['hostname']:
-      distro_utils.RestartNetworking(self.logger)
+    if socket.gethostname() != result['hostname'].split(".")[0]:
+      self.distro_utils.RestartNetworking(self.logger)
 
   def _ExtractInterfaceMetadata(self, metadata):
     """Extracts network interface metadata.
diff --git a/packages/python-google-compute-engine/google_compute_engine/networking/tests/network_daemon_test.py b/packages/python-google-compute-engine/google_compute_engine/networking/tests/network_daemon_test.py
index 9216ea3..5ce68ad 100644
--- a/packages/python-google-compute-engine/google_compute_engine/networking/tests/network_daemon_test.py
+++ b/packages/python-google-compute-engine/google_compute_engine/networking/tests/network_daemon_test.py
@@ -54,7 +54,6 @@ class NetworkDaemonTest(unittest.TestCase):
     mocks.attach_mock(mock_ip_forwarding, 'forwarding')
     mocks.attach_mock(mock_network_setup, 'network_setup')
     mocks.attach_mock(mock_watcher, 'watcher')
-    metadata_key = network_daemon.NetworkDaemon.network_interface_metadata_key
 
     with mock.patch.object(
         network_daemon.NetworkDaemon, 'HandleNetworkInterfaces'
@@ -79,7 +78,7 @@ class NetworkDaemonTest(unittest.TestCase):
           mock.call.lock.LockFile().__enter__(),
           mock.call.logger.Logger().info(mock.ANY),
           mock.call.watcher.MetadataWatcher().WatchMetadata(
-              mock_handle, metadata_key=metadata_key, recursive=True,
+              mock_handle, metadata_key="instance/", recursive=True,
               timeout=mock.ANY),
           mock.call.lock.LockFile().__exit__(None, None, None),
       ]
@@ -129,11 +128,13 @@ class NetworkDaemonTest(unittest.TestCase):
       ]
       self.assertEqual(mocks.mock_calls, expected_calls)
 
-  def testHandleNetworkInterfaces(self):
+  @mock.patch('google_compute_engine.networking.network_daemon.distro_utils')
+  def testHandleNetworkInterfaces(self, mock_distro_utils):
     mocks = mock.Mock()
     mocks.attach_mock(self.mock_ip_forwarding, 'forwarding')
     mocks.attach_mock(self.mock_network_setup, 'network_setup')
     mocks.attach_mock(self.mock_setup, 'setup')
+    mocks.attach_mock(mock_distro_utils, 'distro_utils')
     self.mock_setup.ip_aliases = None
     self.mock_setup.target_instance_ips = None
     self.mock_setup.ip_forwarding_enabled = True
@@ -143,17 +144,19 @@ class NetworkDaemonTest(unittest.TestCase):
             'eth0', forwarded_ips=['a'], ip='1.1.1.1', ipv6=False),
         network_daemon.NetworkDaemon.NetworkInterface('eth1'),
     ]
-    result = mock.Mock()
+    self.mock_setup.distro_utils = mock.MagicMock()
+    result = mock.MagicMock()
 
     network_daemon.NetworkDaemon.HandleNetworkInterfaces(
         self.mock_setup, result)
     expected_calls = [
-        mock.call.setup._ExtractInterfaceMetadata(result),
+        mock.call.setup._ExtractInterfaceMetadata(result['networkInterfaces']),
         mock.call.network_setup.DisableIpv6(['eth0']),
         mock.call.network_setup.EnableNetworkInterfaces(['eth1']),
         mock.call.forwarding.HandleForwardedIps(
             'eth0', ['a'], '1.1.1.1'),
         mock.call.forwarding.HandleForwardedIps('eth1', None, None),
+        mock.call.setup.distro_utils.RestartNetworking(self.mock_setup.logger),
     ]
     self.assertEqual(mocks.mock_calls, expected_calls)
 
@@ -170,16 +173,18 @@ class NetworkDaemonTest(unittest.TestCase):
         network_daemon.NetworkDaemon.NetworkInterface(
             'eth0', forwarded_ips=['a'], ip='1.1.1.1', ipv6=True),
     ]
-    result = mock.Mock()
+    self.mock_setup.distro_utils = mock.MagicMock()
+    result = mock.MagicMock()
 
     network_daemon.NetworkDaemon.HandleNetworkInterfaces(
         self.mock_setup, result)
     expected_calls = [
-        mock.call.setup._ExtractInterfaceMetadata(result),
+        mock.call.setup._ExtractInterfaceMetadata(result['networkInterfaces']),
         mock.call.network_setup.EnableIpv6(['eth0']),
         mock.call.network_setup.EnableNetworkInterfaces([]),
         mock.call.forwarding.HandleForwardedIps(
             'eth0', ['a'], '1.1.1.1'),
+        mock.call.setup.distro_utils.RestartNetworking(self.mock_setup.logger),
     ]
     self.assertEqual(mocks.mock_calls, expected_calls)
 
@@ -196,16 +201,18 @@ class NetworkDaemonTest(unittest.TestCase):
         network_daemon.NetworkDaemon.NetworkInterface(
             'eth0', forwarded_ips=['a'], ip='1.1.1.1', ipv6=False),
     ]
-    result = mock.Mock()
+    self.mock_setup.distro_utils = mock.MagicMock()
+    result = mock.MagicMock()
 
     network_daemon.NetworkDaemon.HandleNetworkInterfaces(
         self.mock_setup, result)
     expected_calls = [
-        mock.call.setup._ExtractInterfaceMetadata(result),
+        mock.call.setup._ExtractInterfaceMetadata(result['networkInterfaces']),
         mock.call.network_setup.DisableIpv6(['eth0']),
         mock.call.network_setup.EnableNetworkInterfaces([]),
         mock.call.forwarding.HandleForwardedIps(
             'eth0', ['a'], '1.1.1.1'),
+        mock.call.setup.distro_utils.RestartNetworking(self.mock_setup.logger),
     ]
     self.assertEqual(mocks.mock_calls, expected_calls)
 
@@ -222,12 +229,14 @@ class NetworkDaemonTest(unittest.TestCase):
         network_daemon.NetworkDaemon.NetworkInterface('a'),
         network_daemon.NetworkDaemon.NetworkInterface('b'),
     ]
-    result = mock.Mock()
+    self.mock_setup.distro_utils = mock.MagicMock()
+    result = mock.MagicMock()
 
     network_daemon.NetworkDaemon.HandleNetworkInterfaces(
         self.mock_setup, result)
     expected_calls = [
-        mock.call.setup._ExtractInterfaceMetadata(result),
+        mock.call.setup._ExtractInterfaceMetadata(result['networkInterfaces']),
+        mock.call.setup.distro_utils.RestartNetworking(self.mock_setup.logger),
     ]
     self.assertEqual(mocks.mock_calls, expected_calls)
 
diff --git a/packages/python-google-compute-engine/google_compute_engine/tests/compat_test.py b/packages/python-google-compute-engine/google_compute_engine/tests/compat_test.py
index 803efef..2e8a128 100644
--- a/packages/python-google-compute-engine/google_compute_engine/tests/compat_test.py
+++ b/packages/python-google-compute-engine/google_compute_engine/tests/compat_test.py
@@ -73,14 +73,10 @@ class CompatTest(unittest.TestCase):
     test_cases = {
         ('Fedora', '28', ''):
             google_compute_engine.distro_lib.el_7.utils,
-        ('debian', '8.10', ''):
-            google_compute_engine.distro_lib.debian_8.utils,
         ('debian', '9.3', ''):
             google_compute_engine.distro_lib.debian_9.utils,
         ('debian', '10.3', ''):
             google_compute_engine.distro_lib.debian_9.utils,
-        ('SUSE Linux Enterprise Server', '11', 'x86_64'):
-            google_compute_engine.distro_lib.sles_11.utils,
         ('SUSE Linux Enterprise Server', '12', 'x86_64'):
             google_compute_engine.distro_lib.sles_12.utils,
         ('SUSE Linux Enterprise Server', '13', 'x86_64'):