Merge lp:~salvatore-orlando/neutron/bug834572 into lp:neutron/diablo

[Salvatore Orlando]

Fixing pep8 errors detected in trunk.

[Ying Liu (yinliu2)]

lgtm.

review: Approve

[Tyler Smith (tylesmit)]

Tests pass and looks good.

review: Approve

[dan wendlandt (danwent)]

I'm a bit confused here, as when I pull this branch I still get errors:

danwent@ubuntu:~$ bzr branch lp:~salvatore-orlando/quantum/bug834572 quantum-pep8-fixes
Branched 54 revision(s).
danwent@ubuntu:~$ cd quantum-pep8-fixes/
danwent@ubuntu:~/quantum-pep8-fixes$ pep8 .
./extensions/_credential_view.py:31:32: W291 trailing whitespace

Is this different from what others are seeing?

review: Needs Information

[dan wendlandt (danwent)]

It seems like the pep8 errors in _credential_view are being handled in a
separate bug: https://bugs.launchpad.net/quantum/+bug/834941

My plan is to merge both of these, once we get two reviews.

Dan

On Fri, Aug 26, 2011 at 12:17 PM, dan wendlandt <email address hidden> wrote:

> Review: Needs Information
> I'm a bit confused here, as when I pull this branch I still get errors:
>
> danwent@ubuntu:~$ bzr branch lp:~salvatore-orlando/quantum/bug834572
> quantum-pep8-fixes
> Branched 54 revision(s).
> danwent@ubuntu:~$ cd quantum-pep8-fixes/
> danwent@ubuntu:~/quantum-pep8-fixes$ pep8 .
> ./extensions/_credential_view.py:31:32: W291 trailing whitespace
>
> Is this different from what others are seeing?
> --
>
> https://code.launchpad.net/~salvatore-orlando/quantum/bug834572/+merge/73010
> You are reviewing the proposed merge of
> lp:~salvatore-orlando/quantum/bug834572 into lp:quantum.
>

--
~~~~~~~~~~~~~~~~~~~~~~~~~~~
Dan Wendlandt
Nicira Networks, Inc.
www.nicira.com | www.openvswitch.org
Sr. Product Manager
cell: 650-906-2650
~~~~~~~~~~~~~~~~~~~~~~~~~~~

[Sumit Naiksatam (snaiksat)]

Dan, I do see a pep8 error as well. I believe all these have been fixed in a branch proposed for merge:
https://code.launchpad.net/~yinliu2/quantum/bug834941/+merge/73086

[dan wendlandt (danwent)]

Thanks Sumit! I just merged both of the branches into trunk.

review: Approve

[Sumit Naiksatam (snaiksat)]

Thanks Dan, just checked, it's clean now after the merge.

=== modified file 'quantum/plugins/cisco/common/cisco_faults.py'
--- quantum/plugins/cisco/common/cisco_faults.py	2011-08-25 19:34:01 +0000
+++ quantum/plugins/cisco/common/cisco_faults.py	2011-08-26 09:55:46 +0000
@@ -71,7 +71,7 @@
     """
     code = 450
     title = 'Portprofile Not Found'
-    explanation = ('Unable to find a Portprofile with' 
+    explanation = ('Unable to find a Portprofile with'
                    + ' the specified identifier.')
 
 
@@ -87,8 +87,8 @@
     code = 430
     title = 'Port not Found'
     explanation = ('Unable to find a port with the specified identifier.')
-    
-    
+
+
 class CredentialNotFound(webob.exc.HTTPClientError):
     """
     subclass of :class:`~HTTPClientError`
@@ -100,10 +100,10 @@
     """
     code = 451
     title = 'Credential Not Found'
-    explanation = ('Unable to find a Credential with' 
+    explanation = ('Unable to find a Credential with'
                    + ' the specified identifier.')
-  
-    
+
+
 class QosNotFound(webob.exc.HTTPClientError):
     """
     subclass of :class:`~HTTPClientError`
@@ -115,10 +115,10 @@
     """
     code = 452
     title = 'QoS Not Found'
-    explanation = ('Unable to find a QoS with' 
+    explanation = ('Unable to find a QoS with'
                    + ' the specified identifier.')
-  
-    
+
+
 class NovatenantNotFound(webob.exc.HTTPClientError):
     """
     subclass of :class:`~HTTPClientError`
@@ -130,7 +130,7 @@
     """
     code = 453
     title = 'Nova tenant Not Found'
-    explanation = ('Unable to find a Novatenant with' 
+    explanation = ('Unable to find a Novatenant with'
                    + ' the specified identifier.')
 
 

=== modified file 'tests/unit/test_extensions.py'
--- tests/unit/test_extensions.py	2011-08-24 20:36:32 +0000
+++ tests/unit/test_extensions.py	2011-08-26 09:55:46 +0000
@@ -72,10 +72,10 @@
         index_response = test_app.get("/tweedles")
         self.assertEqual(200, index_response.status_int)
         self.assertEqual("resource index", index_response.body)
-        
+
         show_response = test_app.get("/tweedles/25266")
         self.assertEqual({'data': {'id': "25266"}}, show_response.json)
-        
+
     def test_resource_extension_with_custom_member_action(self):
         controller = self.ResourceExtensionController()
         member = {'custom_member_action': "GET"}