Fixed OS parameter ordering and test errors

cloudbridge/cloud/providers/openstack/resources.py

@@ -817,7 +817,7 @@ class OpenStackSubnet(BaseSubnet):
     @property
     def state(self):
         return SubnetState.UNKNOWN if self._state == SubnetState.UNKNOWN \
-             else self.SubnetState.AVAILABLE
+             else SubnetState.AVAILABLE
 
     def refresh(self):
         subnet = self._provider.networking.subnets.get(self.id)

cloudbridge/cloud/providers/openstack/services.py

@@ -904,7 +904,7 @@ class OpenStackRouterService(BaseRouterService):
         return ClientPagedResultList(self.provider, aws_routers, limit=limit,
                                      marker=marker)
 
-    def create(self, network, name=None):
+    def create(self, name, network):
         """
         ``network`` is not used by OpenStack.
 

test/test_network_service.py

@@ -119,7 +119,7 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
             "Floating IP {0} should have been deleted but still exists."
             .format(ip_id))
 
-    @helpers.skipIfNoService(['networking.networks.routers'])
+    @helpers.skipIfNoService(['networking.routers'])
     def test_crud_router(self):
 
         def _cleanup(net, subnet, router, gateway):