Merge "Use Python 3.x compatible octal literals"

14 files changed, 44 insertions, 44 deletions

diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index dad496f23..8eb128acf 100644
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -999,13 +999,13 @@ def restart_dhcp(context, dev, network_ref):
         #             are not in multi_host mode.
         optsfile = _dhcp_file(dev, 'opts')
         write_to_file(optsfile, get_dhcp_opts(context, network_ref))
-        os.chmod(optsfile, 0644)
+        os.chmod(optsfile, 0o644)
 
     if network_ref['multi_host']:
         _add_dhcp_mangle_rule(dev)
 
     # Make sure dnsmasq can actually read it (it setuid()s to "nobody")
-    os.chmod(conffile, 0644)
+    os.chmod(conffile, 0o644)
 
     pid = _dnsmasq_pid_for(dev)
 
@@ -1091,7 +1091,7 @@ interface %s
     write_to_file(conffile, conf_str)
 
     # Make sure radvd can actually read it (it setuid()s to "nobody")
-    os.chmod(conffile, 0644)
+    os.chmod(conffile, 0o644)
 
     pid = _ra_pid_for(dev)
 
diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py
index 4b578a787..e22796252 100644
--- a/nova/tests/api/ec2/test_cinder_cloud.py
+++ b/nova/tests/api/ec2/test_cinder_cloud.py
@@ -601,8 +601,8 @@ class CinderCloudTestCase(test.TestCase):
             {'device': 'sdc3', 'virtual': 'swap'},
             {'device': 'sdc4', 'virtual': 'swap'}]
         block_device_mapping1 = [
-            {'device_name': '/dev/sdb1', 'snapshot_id': 01234567},
-            {'device_name': '/dev/sdb2', 'volume_id': 01234567},
+            {'device_name': '/dev/sdb1', 'snapshot_id': 1234567},
+            {'device_name': '/dev/sdb2', 'volume_id': 1234567},
             {'device_name': '/dev/sdb3', 'virtual_name': 'ephemeral5'},
             {'device_name': '/dev/sdb4', 'no_device': True},
 
@@ -625,7 +625,7 @@ class CinderCloudTestCase(test.TestCase):
 
         mappings2 = [{'device': '/dev/sda1', 'virtual': 'root'}]
         block_device_mapping2 = [{'device_name': '/dev/sdb1',
-                                  'snapshot_id': 01234567}]
+                                  'snapshot_id': 1234567}]
         image2 = {
             'id': '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6',
             'name': 'fake_name',
diff --git a/nova/tests/api/openstack/compute/contrib/test_availability_zone.py b/nova/tests/api/openstack/compute/contrib/test_availability_zone.py
index b9066a975..2ccb9fa31 100644
--- a/nova/tests/api/openstack/compute/contrib/test_availability_zone.py
+++ b/nova/tests/api/openstack/compute/contrib/test_availability_zone.py
@@ -56,7 +56,7 @@ def fake_service_get_all(context, disabled=None):
                                datetime.datetime(2012, 12, 26, 14, 45, 25, 0),
                                "fake_host-1", False),
                 __fake_service("nova-sched", "internal",
-                               datetime.datetime(2012, 11, 14, 9, 57, 03, 0),
+                               datetime.datetime(2012, 11, 14, 9, 57, 3, 0),
                                datetime.datetime(2012, 12, 26, 14, 45, 25, 0),
                                "fake_host-1", False),
                 __fake_service("nova-network", "internal",
diff --git a/nova/tests/db/test_db_api.py b/nova/tests/db/test_db_api.py
index 2670c99c7..92b3e0326 100644
--- a/nova/tests/db/test_db_api.py
+++ b/nova/tests/db/test_db_api.py
@@ -363,7 +363,7 @@ class DbApiTestCase(DbTestCase):
                 'fake_host2')
         self.assertEqual(0, len(results))
 
-        updated_at = datetime.datetime(2000, 01, 01, 12, 00, 00)
+        updated_at = datetime.datetime(2000, 1, 1, 12, 0, 0)
         values = {"status": "finished", "updated_at": updated_at,
                 "dest_compute": "fake_host2"}
         migration = db.migration_create(ctxt, values)
@@ -398,7 +398,7 @@ class DbApiTestCase(DbTestCase):
 
         # Ensure one rebooting instance with updated_at older than 10 seconds
         # is returned.
-        updated_at = datetime.datetime(2000, 01, 01, 12, 00, 00)
+        updated_at = datetime.datetime(2000, 1, 1, 12, 0, 0)
         values = {"task_state": "rebooting", "updated_at": updated_at}
         instance = db.instance_create(ctxt, values)
         results = db.instance_get_all_hung_in_rebooting(ctxt, 10)
diff --git a/nova/tests/db/test_migrations.py b/nova/tests/db/test_migrations.py
index 3efa8c6bc..2b5506514 100644
--- a/nova/tests/db/test_migrations.py
+++ b/nova/tests/db/test_migrations.py
@@ -707,8 +707,8 @@ class TestNovaMigrations(BaseMigrationTestCase, CommonTestsMixIn):
             'task_name': 'The name of the task',
             'state': 'The state of the task',
             'host': 'compute-host1',
-            'period_beginning': str(datetime.datetime(2013, 02, 11)),
-            'period_ending': str(datetime.datetime(2013, 02, 12)),
+            'period_beginning': str(datetime.datetime(2013, 2, 11)),
+            'period_ending': str(datetime.datetime(2013, 2, 12)),
             'message': 'The task_log message',
             }
         result = task_log.insert().values(data).execute()
@@ -1433,8 +1433,8 @@ class TestNovaMigrations(BaseMigrationTestCase, CommonTestsMixIn):
             ('key_pairs', {'user_id': 1, 'name': "name_qwer", 'deleted': 0}),
             ('networks', {'vlan': '123', 'deleted': 0}),
             ('task_log', {'task_name': 'task_123', 'host': 'localhost',
-                          'period_beginning': datetime.datetime(2013, 02, 11),
-                          'period_ending': datetime.datetime(2015, 01, 01),
+                          'period_beginning': datetime.datetime(2013, 2, 11),
+                          'period_ending': datetime.datetime(2015, 1, 1),
                           'state': 'state_1', 'message': 'msg_1'}),
             ('virtual_interfaces', {'address': '192.168.0.0'})
         ]
diff --git a/nova/tests/fakeguestfs.py b/nova/tests/fakeguestfs.py
index 2ffc50227..8add963d1 100644
--- a/nova/tests/fakeguestfs.py
+++ b/nova/tests/fakeguestfs.py
@@ -62,7 +62,7 @@ class GuestFS(object):
                 "isdir": True,
                 "gid": 100,
                 "uid": 100,
-                "mode": 0700
+                "mode": 0o700
                 }
 
     def read_file(self, path):
@@ -72,7 +72,7 @@ class GuestFS(object):
                 "content": "Hello World",
                 "gid": 100,
                 "uid": 100,
-                "mode": 0700
+                "mode": 0o700
                 }
 
         return self.files[path]["content"]
@@ -84,7 +84,7 @@ class GuestFS(object):
                 "content": "Hello World",
                 "gid": 100,
                 "uid": 100,
-                "mode": 0700
+                "mode": 0o700
                 }
 
         self.files[path]["content"] = content
@@ -96,7 +96,7 @@ class GuestFS(object):
                 "content": "Hello World",
                 "gid": 100,
                 "uid": 100,
-                "mode": 0700
+                "mode": 0o700
                 }
 
         self.files[path]["content"] = self.files[path]["content"] + content
diff --git a/nova/tests/image/fake.py b/nova/tests/image/fake.py
index d2d80ab35..13d21d524 100644
--- a/nova/tests/image/fake.py
+++ b/nova/tests/image/fake.py
@@ -40,7 +40,7 @@ class _FakeImageService(object):
         self.images = {}
         # NOTE(justinsb): The OpenStack API can't upload an image?
         # So, make sure we've got one..
-        timestamp = datetime.datetime(2011, 01, 01, 01, 02, 03)
+        timestamp = datetime.datetime(2011, 1, 1, 1, 2, 3)
 
         image1 = {'id': '155d900f-4e14-4e4c-a73d-069cbf4541e6',
                  'name': 'fakeimage123456',
diff --git a/nova/tests/virt/baremetal/test_ipmi.py b/nova/tests/virt/baremetal/test_ipmi.py
index ba7a875cf..4b289db15 100644
--- a/nova/tests/virt/baremetal/test_ipmi.py
+++ b/nova/tests/virt/baremetal/test_ipmi.py
@@ -56,7 +56,7 @@ class BareMetalIPMITestCase(test.TestCase):
         pw_file = ipmi._make_password_file(self.node['pm_password'])
         try:
             self.assertTrue(os.path.isfile(pw_file))
-            self.assertEqual(os.stat(pw_file)[stat.ST_MODE] & 0777, 0600)
+            self.assertEqual(os.stat(pw_file)[stat.ST_MODE] & 0o777, 0o600)
             with open(pw_file, "r") as f:
                 pm_password = f.read()
             self.assertEqual(pm_password, self.node['pm_password'])
diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py
index d46b08946..5e08d0529 100644
--- a/nova/tests/virt/libvirt/test_libvirt.py
+++ b/nova/tests/virt/libvirt/test_libvirt.py
@@ -4606,11 +4606,11 @@ disk size: 4.4M''', ''))
             os.close(dst_fd)
             os.unlink(dst_path)
 
-            libvirt_utils.write_to_file(dst_path, 'hello', umask=0277)
+            libvirt_utils.write_to_file(dst_path, 'hello', umask=0o277)
             with open(dst_path, 'r') as fp:
                 self.assertEquals(fp.read(), 'hello')
             mode = os.stat(dst_path).st_mode
-            self.assertEquals(mode & 0277, 0)
+            self.assertEquals(mode & 0o277, 0)
         finally:
             os.unlink(dst_path)
 
diff --git a/nova/tests/virt/test_virt_disk.py b/nova/tests/virt/test_virt_disk.py
index 0c51e8267..20fad1cd4 100644
--- a/nova/tests/virt/test_virt_disk.py
+++ b/nova/tests/virt/test_virt_disk.py
@@ -59,7 +59,7 @@ class VirtDiskTest(test.TestCase):
 
         self.assertTrue("/root/.ssh" in vfs.handle.files)
         self.assertEquals(vfs.handle.files["/root/.ssh"],
-                          {'isdir': True, 'gid': 0, 'uid': 0, 'mode': 0700})
+                          {'isdir': True, 'gid': 0, 'uid': 0, 'mode': 0o700})
         self.assertTrue("/root/.ssh/authorized_keys" in vfs.handle.files)
         self.assertEquals(vfs.handle.files["/root/.ssh/authorized_keys"],
                           {'isdir': False,
@@ -67,7 +67,7 @@ class VirtDiskTest(test.TestCase):
                                       "key was injected by Nova\nmysshkey\n",
                            'gid': 100,
                            'uid': 100,
-                           'mode': 0600})
+                           'mode': 0o600})
 
         vfs.teardown()
 
@@ -89,11 +89,11 @@ class VirtDiskTest(test.TestCase):
                                       "-RF root/.ssh 2>/dev/null || :\n",
                            'gid': 100,
                            'uid': 100,
-                           'mode': 0700})
+                           'mode': 0o700})
 
         self.assertTrue("/root/.ssh" in vfs.handle.files)
         self.assertEquals(vfs.handle.files["/root/.ssh"],
-                          {'isdir': True, 'gid': 0, 'uid': 0, 'mode': 0700})
+                          {'isdir': True, 'gid': 0, 'uid': 0, 'mode': 0o700})
         self.assertTrue("/root/.ssh/authorized_keys" in vfs.handle.files)
         self.assertEquals(vfs.handle.files["/root/.ssh/authorized_keys"],
                           {'isdir': False,
@@ -101,7 +101,7 @@ class VirtDiskTest(test.TestCase):
                                       "key was injected by Nova\nmysshkey\n",
                            'gid': 100,
                            'uid': 100,
-                           'mode': 0600})
+                           'mode': 0o600})
 
         vfs.teardown()
 
@@ -124,7 +124,7 @@ class VirtDiskTest(test.TestCase):
                             "root/.ssh 2>/dev/null || :\n",
                  'gid': 100,
                  'uid': 100,
-                 'mode': 0700})
+                 'mode': 0o700})
         vfs.teardown()
 
     def test_inject_net(self):
@@ -139,7 +139,7 @@ class VirtDiskTest(test.TestCase):
                           {'content': 'mynetconfig',
                            'gid': 100,
                            'isdir': False,
-                           'mode': 0700,
+                           'mode': 0o700,
                            'uid': 100})
         vfs.teardown()
 
@@ -158,7 +158,7 @@ class VirtDiskTest(test.TestCase):
                                       '"eek": "wizz"}',
                            'gid': 100,
                            'isdir': False,
-                           'mode': 0700,
+                           'mode': 0o700,
                            'uid': 100})
         vfs.teardown()
 
@@ -190,7 +190,7 @@ class VirtDiskTest(test.TestCase):
                                       "/sbin/nologin\n",
                            'gid': 100,
                            'isdir': False,
-                           'mode': 0700,
+                           'mode': 0o700,
                            'uid': 100})
         shadow = vfs.handle.files["/etc/shadow"]
 
@@ -204,7 +204,7 @@ class VirtDiskTest(test.TestCase):
                                           "daemon:*:14495:0:99999:7:::\n",
                                'gid': 100,
                                'isdir': False,
-                               'mode': 0700,
+                               'mode': 0o700,
                                'uid': 100})
         else:
             self.assertEquals(shadow,
@@ -214,6 +214,6 @@ class VirtDiskTest(test.TestCase):
                                           "daemon:*:14495:0:99999:7:::\n",
                                'gid': 100,
                                'isdir': False,
-                               'mode': 0700,
+                               'mode': 0o700,
                                'uid': 100})
         vfs.teardown()
diff --git a/nova/tests/virt/test_virt_disk_vfs_guestfs.py b/nova/tests/virt/test_virt_disk_vfs_guestfs.py
index 16c85f815..778530741 100644
--- a/nova/tests/virt/test_virt_disk_vfs_guestfs.py
+++ b/nova/tests/virt/test_virt_disk_vfs_guestfs.py
@@ -173,10 +173,10 @@ class VirtDiskVFSGuestFSTest(test.TestCase):
         vfs.setup()
         vfs.read_file("/some/file")
 
-        self.assertEquals(vfs.handle.files["/some/file"]["mode"], 0700)
+        self.assertEquals(vfs.handle.files["/some/file"]["mode"], 0o700)
 
-        vfs.set_permissions("/some/file", 0777)
-        self.assertEquals(vfs.handle.files["/some/file"]["mode"], 0777)
+        vfs.set_permissions("/some/file", 0o7777)
+        self.assertEquals(vfs.handle.files["/some/file"]["mode"], 0o7777)
 
         vfs.teardown()
 
diff --git a/nova/tests/virt/test_virt_disk_vfs_localfs.py b/nova/tests/virt/test_virt_disk_vfs_localfs.py
index b52817b18..18df393ce 100644
--- a/nova/tests/virt/test_virt_disk_vfs_localfs.py
+++ b/nova/tests/virt/test_virt_disk_vfs_localfs.py
@@ -98,7 +98,7 @@ def fake_execute(*args, **kwargs):
                 "content": "Hello World",
                 "gid": 100,
                 "uid": 100,
-                "mode": 0700
+                "mode": 0o700
                 }
         return files[path]["content"], ""
     elif args[0] == "tee":
@@ -113,7 +113,7 @@ def fake_execute(*args, **kwargs):
                 "content": "Hello World",
                 "gid": 100,
                 "uid": 100,
-                "mode": 0700,
+                "mode": 0o700,
                 }
         if append:
             files[path]["content"] += kwargs["process_input"]
@@ -306,8 +306,8 @@ class VirtDiskVFSLocalFSTest(test.TestCase):
         vfs.imgdir = "/scratch/dir"
         vfs.read_file("/some/file")
 
-        vfs.set_permissions("/some/file", 0777)
-        self.assertEquals(files["/scratch/dir/some/file"]["mode"], 0777)
+        vfs.set_permissions("/some/file", 0o777)
+        self.assertEquals(files["/scratch/dir/some/file"]["mode"], 0o777)
 
         root_helper = 'sudo nova-rootwrap %s' % CONF.rootwrap_config
         self.assertEqual(commands,
diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py
index 9fdec0e87..5b8782924 100755
--- a/nova/virt/disk/api.py
+++ b/nova/virt/disk/api.py
@@ -425,7 +425,7 @@ def _setup_selinux_for_keys(fs, sshdir):
         restorecon.insert(0, '#!/bin/sh')
 
     _inject_file_into_fs(fs, rclocal, ''.join(restorecon), append=True)
-    fs.set_permissions(rclocal, 0700)
+    fs.set_permissions(rclocal, 0o700)
 
 
 def _inject_key_into_fs(key, fs):
@@ -439,7 +439,7 @@ def _inject_key_into_fs(key, fs):
     sshdir = os.path.join('root', '.ssh')
     fs.make_path(sshdir)
     fs.set_ownership(sshdir, "root", "root")
-    fs.set_permissions(sshdir, 0700)
+    fs.set_permissions(sshdir, 0o700)
 
     keyfile = os.path.join(sshdir, 'authorized_keys')
 
@@ -452,7 +452,7 @@ def _inject_key_into_fs(key, fs):
     ])
 
     _inject_file_into_fs(fs, keyfile, key_data, append=True)
-    fs.set_permissions(keyfile, 0600)
+    fs.set_permissions(keyfile, 0o600)
 
     _setup_selinux_for_keys(fs, sshdir)
 
@@ -467,7 +467,7 @@ def _inject_net_into_fs(net, fs):
     netdir = os.path.join('etc', 'network')
     fs.make_path(netdir)
     fs.set_ownership(netdir, "root", "root")
-    fs.set_permissions(netdir, 0744)
+    fs.set_permissions(netdir, 0o744)
 
     netfile = os.path.join('etc', 'network', 'interfaces')
     _inject_file_into_fs(fs, netfile, net)
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 91d5b1a50..6dde42d5a 100755
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -1774,7 +1774,7 @@ class LibvirtDriver(driver.ComputeDriver):
 
         # NOTE(vish): No need add the suffix to console.log
         libvirt_utils.write_to_file(
-            self._get_console_log_path(instance), '', 007)
+            self._get_console_log_path(instance), '', 7)
 
         if not disk_images:
             disk_images = {'image_id': instance['image_ref'],