Merge branch 'development'v20190916

12 files changed, 29 insertions, 44 deletions

diff --git a/packages/google-compute-engine/packaging/debian/changelog b/packages/google-compute-engine/packaging/debian/changelog
index eef0f9a..81262c9 100644
--- a/packages/google-compute-engine/packaging/debian/changelog
+++ b/packages/google-compute-engine/packaging/debian/changelog
@@ -1,8 +1,8 @@
-google-compute-engine (1:20190911.00-g1) stable; urgency=medium
+google-compute-engine (1:20190916.00-g1) stable; urgency=medium
 
   * Bump version to match python package release.
 
- -- Google Cloud Team <gc-team@google.com>  Thu, 11 Sep 2019 10:39:08 -0700
+ -- Google Cloud Team <gc-team@google.com>  Mon, 16 Sep 2019 15:51:24 -0700
 
 google-compute-engine (1:20190905.00-g1) stable; urgency=medium
 
diff --git a/packages/google-compute-engine/packaging/google-compute-engine-el6.spec b/packages/google-compute-engine/packaging/google-compute-engine-el6.spec
index 5555b20..ffa5c74 100644
--- a/packages/google-compute-engine/packaging/google-compute-engine-el6.spec
+++ b/packages/google-compute-engine/packaging/google-compute-engine-el6.spec
@@ -60,11 +60,6 @@ ln -sf /usr/bin/google_set_hostname %{buildroot}/etc/dhcp/dhclient-exit-hooks
 %config /etc/sysctl.d/*
 
 %post
-if [ $1 -eq 2 ]; then
-  # New service might not be enabled during upgrade.
-  systemctl enable google-network-daemon.service
-fi
-
 # On upgrade run instance setup again to handle any new configs and restart
 # daemons.
 if [ $1 -eq 2 ]; then
diff --git a/packages/google-compute-engine/packaging/google-compute-engine.spec b/packages/google-compute-engine/packaging/google-compute-engine.spec
index 1ec37dc..3d0560e 100644
--- a/packages/google-compute-engine/packaging/google-compute-engine.spec
+++ b/packages/google-compute-engine/packaging/google-compute-engine.spec
@@ -66,6 +66,11 @@ cp -a src/lib/udev/rules.d/* %{buildroot}/%{_udevrulesdir}
 %config /etc/sysctl.d/*
 
 %post
+if [ $1 -eq 2 ]; then
+  # New service might not be enabled during upgrade.
+  systemctl enable google-network-daemon.service
+fi
+
 # On upgrade run instance setup again to handle any new configs and restart
 # daemons.
 if [ $1 -eq 2 ]; then
diff --git a/packages/google-compute-engine/packaging/setup_deb.sh b/packages/google-compute-engine/packaging/setup_deb.sh
index b916078..66c2f30 100755
--- a/packages/google-compute-engine/packaging/setup_deb.sh
+++ b/packages/google-compute-engine/packaging/setup_deb.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="google-compute-engine"
-VERSION="20190911.00"
+VERSION="20190916.00"
 
 working_dir=${PWD}
 if [[ $(basename "$working_dir") != $NAME ]]; then
diff --git a/packages/google-compute-engine/packaging/setup_rpm.sh b/packages/google-compute-engine/packaging/setup_rpm.sh
index 2699144..b0590e2 100755
--- a/packages/google-compute-engine/packaging/setup_rpm.sh
+++ b/packages/google-compute-engine/packaging/setup_rpm.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="google-compute-engine"
-VERSION="20190911.00"
+VERSION="20190916.00"
 
 rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}
 working_dir=${PWD}
diff --git a/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service b/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service
index 233298a..c150693 100644
--- a/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service
+++ b/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service
@@ -2,6 +2,7 @@
 Description=Google Compute Engine Startup Scripts
 After=network-online.target network.target rsyslog.service
 After=google-instance-setup.service google-network-daemon.service
+Before=apt-daily.service
 
 [Service]
 ExecStart=/usr/bin/google_metadata_script_runner --script-type startup
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 c15d597..5bc55ce 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
@@ -30,7 +30,6 @@ from google_compute_engine import file_utils
 from google_compute_engine import logger
 from google_compute_engine import metadata_watcher
 from google_compute_engine import network_utils
-from google_compute_engine.compat import distro_utils
 from google_compute_engine.networking.ip_forwarding import ip_forwarding
 from google_compute_engine.networking.network_setup import network_setup
 
@@ -40,7 +39,7 @@ LOCKFILE = constants.LOCALSTATEDIR + '/lock/google_networking.lock'
 class NetworkDaemon(object):
   """Manage networking based on changes to network metadata."""
 
-  instance_metadata_key = 'instance/'
+  network_interface_metadata_key = 'instance/network-interfaces'
 
   def __init__(
       self, ip_forwarding_enabled, proto_id, ip_aliases, target_instance_ips,
@@ -64,7 +63,6 @@ class NetworkDaemon(object):
     self.ip_forwarding_enabled = ip_forwarding_enabled
     self.network_setup_enabled = network_setup_enabled
     self.target_instance_ips = target_instance_ips
-    self.dhclient_script = dhclient_script
 
     self.ip_forwarding = ip_forwarding.IpForwarding(
         proto_id=proto_id, debug=debug)
@@ -72,7 +70,6 @@ class NetworkDaemon(object):
         dhclient_script=dhclient_script, dhcp_command=dhcp_command, debug=debug)
     self.network_utils = network_utils.NetworkUtils(logger=self.logger)
     self.watcher = metadata_watcher.MetadataWatcher(logger=self.logger)
-    self.distro_utils = distro_utils.Utils(debug=debug)
 
     try:
       with file_utils.LockFile(LOCKFILE):
@@ -80,7 +77,7 @@ class NetworkDaemon(object):
         timeout = 60 + random.randint(0, 30)
         self.watcher.WatchMetadata(
             self.HandleNetworkInterfaces,
-            metadata_key=self.instance_metadata_key, recursive=True,
+            metadata_key=self.network_interface_metadata_key, recursive=True,
             timeout=timeout)
     except (IOError, OSError) as e:
       self.logger.warning(str(e))
@@ -91,8 +88,7 @@ class NetworkDaemon(object):
     Args:
       result: dict, the metadata response with the network interfaces.
     """
-    network_interfaces = self._ExtractInterfaceMetadata(
-        result['networkInterfaces'])
+    network_interfaces = self._ExtractInterfaceMetadata(result)
 
     if self.network_setup_enabled:
       default_interface = network_interfaces[0]
@@ -107,8 +103,6 @@ class NetworkDaemon(object):
       for interface in network_interfaces:
         self.ip_forwarding.HandleForwardedIps(
             interface.name, interface.forwarded_ips, interface.ip)
-    if socket.gethostname().split('.')[0] != 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 2c3640a..9216ea3 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,7 @@ 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.instance_metadata_key
+    metadata_key = network_daemon.NetworkDaemon.network_interface_metadata_key
 
     with mock.patch.object(
         network_daemon.NetworkDaemon, 'HandleNetworkInterfaces'
@@ -129,13 +129,11 @@ class NetworkDaemonTest(unittest.TestCase):
       ]
       self.assertEqual(mocks.mock_calls, expected_calls)
 
-  @mock.patch('google_compute_engine.networking.network_daemon.distro_utils')
-  def testHandleNetworkInterfaces(self, mock_distro_utils):
+  def testHandleNetworkInterfaces(self):
     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
@@ -145,19 +143,17 @@ class NetworkDaemonTest(unittest.TestCase):
             'eth0', forwarded_ips=['a'], ip='1.1.1.1', ipv6=False),
         network_daemon.NetworkDaemon.NetworkInterface('eth1'),
     ]
-    self.mock_setup.distro_utils = mock.MagicMock()
-    result = mock.MagicMock()
+    result = mock.Mock()
 
     network_daemon.NetworkDaemon.HandleNetworkInterfaces(
         self.mock_setup, result)
     expected_calls = [
-        mock.call.setup._ExtractInterfaceMetadata(result['networkInterfaces']),
+        mock.call.setup._ExtractInterfaceMetadata(result),
         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)
 
@@ -174,18 +170,16 @@ class NetworkDaemonTest(unittest.TestCase):
         network_daemon.NetworkDaemon.NetworkInterface(
             'eth0', forwarded_ips=['a'], ip='1.1.1.1', ipv6=True),
     ]
-    self.mock_setup.distro_utils = mock.MagicMock()
-    result = mock.MagicMock()
+    result = mock.Mock()
 
     network_daemon.NetworkDaemon.HandleNetworkInterfaces(
         self.mock_setup, result)
     expected_calls = [
-        mock.call.setup._ExtractInterfaceMetadata(result['networkInterfaces']),
+        mock.call.setup._ExtractInterfaceMetadata(result),
         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)
 
@@ -202,18 +196,16 @@ class NetworkDaemonTest(unittest.TestCase):
         network_daemon.NetworkDaemon.NetworkInterface(
             'eth0', forwarded_ips=['a'], ip='1.1.1.1', ipv6=False),
     ]
-    self.mock_setup.distro_utils = mock.MagicMock()
-    result = mock.MagicMock()
+    result = mock.Mock()
 
     network_daemon.NetworkDaemon.HandleNetworkInterfaces(
         self.mock_setup, result)
     expected_calls = [
-        mock.call.setup._ExtractInterfaceMetadata(result['networkInterfaces']),
+        mock.call.setup._ExtractInterfaceMetadata(result),
         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)
 
@@ -230,14 +222,12 @@ class NetworkDaemonTest(unittest.TestCase):
         network_daemon.NetworkDaemon.NetworkInterface('a'),
         network_daemon.NetworkDaemon.NetworkInterface('b'),
     ]
-    self.mock_setup.distro_utils = mock.MagicMock()
-    result = mock.MagicMock()
+    result = mock.Mock()
 
     network_daemon.NetworkDaemon.HandleNetworkInterfaces(
         self.mock_setup, result)
     expected_calls = [
-        mock.call.setup._ExtractInterfaceMetadata(result['networkInterfaces']),
-        mock.call.setup.distro_utils.RestartNetworking(self.mock_setup.logger),
+        mock.call.setup._ExtractInterfaceMetadata(result),
     ]
     self.assertEqual(mocks.mock_calls, expected_calls)
 
diff --git a/packages/python-google-compute-engine/packaging/debian/changelog b/packages/python-google-compute-engine/packaging/debian/changelog
index 556ec79..edf3f0c 100644
--- a/packages/python-google-compute-engine/packaging/debian/changelog
+++ b/packages/python-google-compute-engine/packaging/debian/changelog
@@ -1,8 +1,8 @@
-python-google-compute-engine (1:20190911.00-g1) stable; urgency=medium
+python-google-compute-engine (1:20190916.00-g1) stable; urgency=medium
 
-  * Fix network restart bug when detecting hostname change.
+  * Revert VM rename feature.
 
- -- Google Cloud Team <gc-team@google.com>  Thu, 11 Sep 2019 10:40:11 -0700
+ -- Google Cloud Team <gc-team@google.com>  Mon, 16 Sep 2019 15:52:24 -0700
 
 python-google-compute-engine (1:20190905.00-g1) stable; urgency=medium
 
diff --git a/packages/python-google-compute-engine/packaging/setup_deb.sh b/packages/python-google-compute-engine/packaging/setup_deb.sh
index 7acbb07..1b64ba7 100755
--- a/packages/python-google-compute-engine/packaging/setup_deb.sh
+++ b/packages/python-google-compute-engine/packaging/setup_deb.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="python-google-compute-engine"
-VERSION="20190911.00"
+VERSION="20190916.00"
 
 working_dir=${PWD}
 if [[ $(basename "$working_dir") != $NAME ]]; then
diff --git a/packages/python-google-compute-engine/packaging/setup_rpm.sh b/packages/python-google-compute-engine/packaging/setup_rpm.sh
index bef3031..acd617c 100755
--- a/packages/python-google-compute-engine/packaging/setup_rpm.sh
+++ b/packages/python-google-compute-engine/packaging/setup_rpm.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="python-google-compute-engine"
-VERSION="20190911.00"
+VERSION="20190916.00"
 
 rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}
 working_dir=${PWD}
diff --git a/packages/python-google-compute-engine/setup.py b/packages/python-google-compute-engine/setup.py
index 02a0ec5..c8900f9 100755
--- a/packages/python-google-compute-engine/setup.py
+++ b/packages/python-google-compute-engine/setup.py
@@ -37,7 +37,7 @@ setuptools.setup(
     name='google-compute-engine',
     packages=setuptools.find_packages(),
     url='https://github.com/GoogleCloudPlatform/compute-image-packages',
-    version='20190911.0',
+    version='20190916.0',
     # Entry points create scripts in /usr/bin that call a function.
     entry_points={
         'console_scripts': [