Cleanup GCE PR

.travis.yml

@@ -39,8 +39,8 @@ env:
   global:
     - PYTHONUNBUFFERED=True
 before_install:
-	- openssl aes-256-cbc -K $encrypted_b3fcf6d0737c_key -iv $encrypted_b3fcf6d0737c_iv
-  		-in credentials.tar.gz.enc -out credentials.tar.gz -d
+  - openssl aes-256-cbc -K $encrypted_b3fcf6d0737c_key -iv $encrypted_b3fcf6d0737c_iv
+      -in credentials.tar.gz.enc -out credentials.tar.gz -d
     - |
       case "$TRAVIS_EVENT_TYPE" in
         push|pull_request)

cloudbridge/cloud/base/resources.py

@@ -668,10 +668,6 @@ class BaseVMFirewallRule(BaseCloudResource, VMFirewallRule):
         js['firewall'] = self.firewall.id
         return js
 
-    @property
-    def parent(self):
-        return self._parent
-
 
 class BasePlacementZone(BaseCloudResource, PlacementZone):
 

cloudbridge/cloud/interfaces/resources.py

@@ -460,7 +460,7 @@ class ResultList(list):
         """
         Indicate whether this ``ResultList`` supports server side paging.
 
-        If server side paging is not supported, the result will useclient side
+        If server side paging is not supported, the result will use client side
         paging and the data property provides direct access to all available
         data.
         """

setup.py

@@ -23,8 +23,7 @@ REQS_BASE = [
     'six>=1.11',
     'tenacity>=4.12.0,<=5.0',
     'cachetools>=2.1.0',
-    'deprecated>=1.2.3',
-    'oslo.i18n>=3.15.3'
+    'deprecated>=1.2.3'
 ]
 REQS_AWS = ['boto3<1.8.0']
 # Install azure>=3.0.0 package to find which of the azure libraries listed
@@ -57,9 +56,6 @@ REQS_DEV = ([
     'tox>=2.1.1',
     'nose',
     'moto>=1.3.2',
-    'docutils>=0.14',
-    'imagesize>=0.7.1',
-    'jinja2>=2.9.6',
     'sphinx>=1.3.1',
     'pydevd',
     'flake8>=3.3.0',

test/test_compute_service.py

@@ -365,7 +365,8 @@ class CloudComputeServiceTestCase(ProviderTestBase):
                     fip = gateway.floating_ips.create()
                     self.assertFalse(
                         fip.in_use,
-                        "Newly created floating IP should not be in use.")
+                        "Newly created floating IP %s should not be in use." %
+                        fip.public_ip)
 
                     with helpers.cleanup_action(
                             lambda: test_inst.remove_floating_ip(fip)):
@@ -377,7 +378,8 @@ class CloudComputeServiceTestCase(ProviderTestBase):
                         fip.refresh()
                         self.assertTrue(
                             fip.in_use,
-                            "Attached floating IP address should be in use.")
+                            "Attached floating IP %s address should be in use."
+                            % fip.public_ip)
                     test_inst.refresh()
                     test_inst.reboot()
                     test_inst.wait_till_ready()