Adding 'hidden' services

cloudbridge/cloud/base/services.py

@@ -62,6 +62,18 @@ 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_rules
+
 
 class BaseKeyPairService(
         BasePageableObjectMixin, KeyPairService, BaseCloudService):
@@ -241,6 +253,26 @@ 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

@@ -80,14 +80,7 @@ class AWSSecurityService(BaseSecurityService):
         # Initialize provider services
         self._key_pairs = AWSKeyPairService(provider)
         self._vm_firewalls = AWSVMFirewallService(provider)
-
-    @property
-    def key_pairs(self):
-        return self._key_pairs
-
-    @property
-    def vm_firewalls(self):
-        return self._vm_firewalls
+        self._vm_firewall_rules = AWSVMFirewallRuleService(provider)
 
 
 class AWSKeyPairService(BaseKeyPairService):
@@ -863,22 +856,7 @@ class AWSNetworkingService(BaseNetworkingService):
         self._subnet_service = AWSSubnetService(self.provider)
         self._router_service = AWSRouterService(self.provider)
         self._gateway_service = AWSGatewayService(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
+        self._floating_ip_service = AWSFloatingIPService(self.provider)
 
 
 class AWSNetworkService(BaseNetworkService):

cloudbridge/cloud/providers/azure/services.py

@@ -71,14 +71,7 @@ class AzureSecurityService(BaseSecurityService):
         # Initialize provider services
         self._key_pairs = AzureKeyPairService(provider)
         self._vm_firewalls = AzureVMFirewallService(provider)
-
-    @property
-    def key_pairs(self):
-        return self._key_pairs
-
-    @property
-    def vm_firewalls(self):
-        return self._vm_firewalls
+        self._vm_firewall_rules = AzureVMFirewallRuleService(provider)
 
 
 class AzureVMFirewallService(BaseVMFirewallService):
@@ -1073,18 +1066,8 @@ class AzureNetworkingService(BaseNetworkingService):
         self._network_service = AzureNetworkService(self.provider)
         self._subnet_service = AzureSubnetService(self.provider)
         self._router_service = AzureRouterService(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
+        self._gateway_service = AzureGatewayService(self.provider)
+        self._floating_ip_service = AzureFloatingIPService(self.provider)
 
 
 class AzureNetworkService(BaseNetworkService):

cloudbridge/cloud/providers/gce/services.py

@@ -68,14 +68,7 @@ class GCESecurityService(BaseSecurityService):
         # Initialize provider services
         self._key_pairs = GCEKeyPairService(provider)
         self._vm_firewalls = GCEVMFirewallService(provider)
-
-    @property
-    def key_pairs(self):
-        return self._key_pairs
-
-    @property
-    def vm_firewalls(self):
-        return self._vm_firewalls
+        self._vm_firewall_rules = GCEVMFirewallRuleService(provider)
 
 
 class GCEKeyPairService(BaseKeyPairService):
@@ -708,18 +701,8 @@ class GCENetworkingService(BaseNetworkingService):
         self._network_service = GCENetworkService(self.provider)
         self._subnet_service = GCESubnetService(self.provider)
         self._router_service = GCERouterService(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
+        self._gateway_service = GCEGatewayService(self.provider)
+        self._floating_ip_service = GCEFloatingIPService(self.provider)
 
 
 class GCENetworkService(BaseNetworkService):

cloudbridge/cloud/providers/openstack/services.py

@@ -84,26 +84,7 @@ class OpenStackSecurityService(BaseSecurityService):
         # Initialize provider services
         self._key_pairs = OpenStackKeyPairService(provider)
         self._vm_firewalls = OpenStackVMFirewallService(provider)
-
-    @property
-    def key_pairs(self):
-        """
-        Provides access to key pairs for this provider.
-
-        :rtype: ``object`` of :class:`.KeyPairService`
-        :return: a KeyPairService object
-        """
-        return self._key_pairs
-
-    @property
-    def vm_firewalls(self):
-        """
-        Provides access to VM firewalls for this provider.
-
-        :rtype: ``object`` of :class:`.VMFirewallService`
-        :return: a VMFirewallService object
-        """
-        return self._vm_firewalls
+        self._vm_firewall_rules = OpenStackVMFirewallRuleService(provider)
 
     def get_or_create_ec2_credentials(self):
         """
@@ -951,18 +932,8 @@ class OpenStackNetworkingService(BaseNetworkingService):
         self._network_service = OpenStackNetworkService(self.provider)
         self._subnet_service = OpenStackSubnetService(self.provider)
         self._router_service = OpenStackRouterService(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
+        self._gateway_service = OpenStackGatewayService(self.provider)
+        self._floating_ip_service = OpenStackFloatingIPService(self.provider)
 
 
 class OpenStackNetworkService(BaseNetworkService):