Quellcode durchsuchen

Removed obsolete networking methods from interface

Nuwan Goonasekera vor 8 Jahren
Ursprung
Commit
6067132222

+ 0 - 10
cloudbridge/cloud/interfaces/services.py

@@ -653,16 +653,6 @@ class NetworkService(PageableObjectMixin, CloudService):
         """
         pass
 
-    @abstractproperty
-    def routers(self):
-        """
-        Returns a list of routers connected to this network.
-
-        :rtype: ``list`` of :class: `Router`
-        :return: list of routers
-        """
-        pass
-
     @abstractproperty
     def floating_ips(self):
         """

+ 0 - 12
cloudbridge/cloud/providers/aws/services.py

@@ -836,18 +836,6 @@ class AWSNetworkService(BaseNetworkService):
         ip = self.provider.ec2_conn.allocate_address(domain='vpc')
         return AWSFloatingIP(self.provider, ip)
 
-    def routers(self):
-        routers = self.provider.vpc_conn.get_all_internet_gateways()
-        return [AWSRouter(self.provider, r) for r in routers]
-
-    def create_router(self, name=None):
-        router = self.provider.vpc_conn.create_internet_gateway()
-        cb_router = AWSRouter(self.provider, router)
-        if name:
-            time.sleep(2)  # Some time is required
-            cb_router.name = name
-        return cb_router
-
 
 class AWSSubnetService(BaseSubnetService):
 

+ 2 - 12
cloudbridge/cloud/providers/openstack/services.py

@@ -583,7 +583,8 @@ class OpenStackInstanceService(BaseInstanceService):
             net_id = subnet.network_id
         else:
             subnet_id = subnet
-            net_id = (self.provider.networking.subnets.get(subnet_id).network_id
+            net_id = (self.provider.networking.subnets
+                      .get(subnet_id).network_id
                       if subnet_id else None)
         zone_id = zone.id if isinstance(zone, PlacementZone) else zone
         key_pair_name = key_pair.name if \
@@ -813,17 +814,6 @@ class OpenStackNetworkService(BaseNetworkService):
         ip = self.provider.neutron.list_floatingips(id=ip.id)['floatingips'][0]
         return OpenStackFloatingIP(self.provider, ip)
 
-    def routers(self):
-        routers = self.provider.neutron.list_routers().get('routers')
-        return [OpenStackRouter(self.provider, r) for r in routers]
-
-    def create_router(self, name=None):
-        OpenStackRouter.assert_valid_resource_name(name)
-
-        router = self.provider.neutron.create_router(
-            {'router': {'name': name}})
-        return OpenStackRouter(self.provider, router.get('router'))
-
 
 class OpenStackSubnetService(BaseSubnetService):