Services moved back to provider classes

cloudbridge/cloud/base/services.py

@@ -62,18 +62,6 @@ class BaseSecurityService(SecurityService, BaseCloudService):
     def __init__(self, provider):
         super(BaseSecurityService, self).__init__(provider)
 
-    @property
-    def key_pairs(self):
-        return self._key_pairs
-
-    @property
-    def vm_firewalls(self):
-        return self._vm_firewalls
-
-    @property
-    def _vm_firewall_rules(self):
-        return self._vm_firewall_rule_svc
-
 
 class BaseKeyPairService(
         BasePageableObjectMixin, KeyPairService, BaseCloudService):
@@ -259,26 +247,6 @@ class BaseNetworkingService(NetworkingService, BaseCloudService):
     def __init__(self, provider):
         super(BaseNetworkingService, self).__init__(provider)
 
-    @property
-    def networks(self):
-        return self._network_service
-
-    @property
-    def subnets(self):
-        return self._subnet_service
-
-    @property
-    def routers(self):
-        return self._router_service
-
-    @property
-    def _gateways(self):
-        return self._gateway_service
-
-    @property
-    def _floating_ips(self):
-        return self._floating_ip_service
-
 
 class BaseNetworkService(
         BasePageableObjectMixin, NetworkService, BaseCloudService):

cloudbridge/cloud/providers/aws/services.py

@@ -82,6 +82,18 @@ class AWSSecurityService(BaseSecurityService):
         self._vm_firewalls = AWSVMFirewallService(provider)
         self._vm_firewall_rule_svc = AWSVMFirewallRuleService(provider)
 
+    @property
+    def key_pairs(self):
+        return self._key_pairs
+
+    @property
+    def vm_firewalls(self):
+        return self._vm_firewalls
+
+    @property
+    def _vm_firewall_rules(self):
+        return self._vm_firewall_rule_svc
+
 
 class AWSKeyPairService(BaseKeyPairService):
 
@@ -871,6 +883,26 @@ class AWSNetworkingService(BaseNetworkingService):
         self._gateway_service = AWSGatewayService(self.provider)
         self._floating_ip_service = AWSFloatingIPService(self.provider)
 
+    @property
+    def networks(self):
+        return self._network_service
+
+    @property
+    def subnets(self):
+        return self._subnet_service
+
+    @property
+    def routers(self):
+        return self._router_service
+
+    @property
+    def _gateways(self):
+        return self._gateway_service
+
+    @property
+    def _floating_ips(self):
+        return self._floating_ip_service
+
 
 class AWSNetworkService(BaseNetworkService):
 

cloudbridge/cloud/providers/azure/services.py

@@ -73,6 +73,18 @@ class AzureSecurityService(BaseSecurityService):
         self._vm_firewalls = AzureVMFirewallService(provider)
         self._vm_firewall_rule_svc = AzureVMFirewallRuleService(provider)
 
+    @property
+    def key_pairs(self):
+        return self._key_pairs
+
+    @property
+    def vm_firewalls(self):
+        return self._vm_firewalls
+
+    @property
+    def _vm_firewall_rules(self):
+        return self._vm_firewall_rule_svc
+
 
 class AzureVMFirewallService(BaseVMFirewallService):
     def __init__(self, provider):
@@ -1079,6 +1091,26 @@ class AzureNetworkingService(BaseNetworkingService):
         self._gateway_service = AzureGatewayService(self.provider)
         self._floating_ip_service = AzureFloatingIPService(self.provider)
 
+    @property
+    def networks(self):
+        return self._network_service
+
+    @property
+    def subnets(self):
+        return self._subnet_service
+
+    @property
+    def routers(self):
+        return self._router_service
+
+    @property
+    def _gateways(self):
+        return self._gateway_service
+
+    @property
+    def _floating_ips(self):
+        return self._floating_ip_service
+
 
 class AzureNetworkService(BaseNetworkService):
     def __init__(self, provider):

cloudbridge/cloud/providers/gce/services.py

@@ -70,6 +70,18 @@ class GCESecurityService(BaseSecurityService):
         self._vm_firewalls = GCEVMFirewallService(provider)
         self._vm_firewall_rule_svc = GCEVMFirewallRuleService(provider)
 
+    @property
+    def key_pairs(self):
+        return self._key_pairs
+
+    @property
+    def vm_firewalls(self):
+        return self._vm_firewalls
+
+    @property
+    def _vm_firewall_rules(self):
+        return self._vm_firewall_rule_svc
+
 
 class GCEKeyPairService(BaseKeyPairService):
 
@@ -716,6 +728,26 @@ class GCENetworkingService(BaseNetworkingService):
         self._gateway_service = GCEGatewayService(self.provider)
         self._floating_ip_service = GCEFloatingIPService(self.provider)
 
+    @property
+    def networks(self):
+        return self._network_service
+
+    @property
+    def subnets(self):
+        return self._subnet_service
+
+    @property
+    def routers(self):
+        return self._router_service
+
+    @property
+    def _gateways(self):
+        return self._gateway_service
+
+    @property
+    def _floating_ips(self):
+        return self._floating_ip_service
+
 
 class GCENetworkService(BaseNetworkService):
 

cloudbridge/cloud/providers/openstack/services.py

@@ -86,6 +86,18 @@ class OpenStackSecurityService(BaseSecurityService):
         self._vm_firewalls = OpenStackVMFirewallService(provider)
         self._vm_firewall_rule_svc = OpenStackVMFirewallRuleService(provider)
 
+    @property
+    def key_pairs(self):
+        return self._key_pairs
+
+    @property
+    def vm_firewalls(self):
+        return self._vm_firewalls
+
+    @property
+    def _vm_firewall_rules(self):
+        return self._vm_firewall_rule_svc
+
     def get_or_create_ec2_credentials(self):
         """
         A provider specific method than returns the ec2 credentials for the
@@ -949,6 +961,26 @@ class OpenStackNetworkingService(BaseNetworkingService):
         self._gateway_service = OpenStackGatewayService(self.provider)
         self._floating_ip_service = OpenStackFloatingIPService(self.provider)
 
+    @property
+    def networks(self):
+        return self._network_service
+
+    @property
+    def subnets(self):
+        return self._subnet_service
+
+    @property
+    def routers(self):
+        return self._router_service
+
+    @property
+    def _gateways(self):
+        return self._gateway_service
+
+    @property
+    def _floating_ips(self):
+        return self._floating_ip_service
+
 
 class OpenStackNetworkService(BaseNetworkService):