소스 검색

Use a different subnet filter key as this one works with moto

Enis Afgan 10 년 전
부모
커밋
c467ae4ad8
2개의 변경된 파일5개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 1
      cloudbridge/cloud/providers/aws/resources.py
  2. 4 6
      test/test_network_service.py

+ 1 - 1
cloudbridge/cloud/providers/aws/resources.py

@@ -755,7 +755,7 @@ class AWSNetwork(BaseNetwork):
         return self._vpc.delete()
 
     def subnets(self):
-        flter = {'vpcId': self.id}
+        flter = {'vpc-id': self.id}
         subnets = self._provider.vpc_conn.get_all_subnets(filters=flter)
         return [AWSSubnet(self._provider, subnet) for subnet in subnets]
 

+ 4 - 6
test/test_network_service.py

@@ -87,12 +87,10 @@ class CloudNetworkServiceTestCase(ProviderTestBase):
             cidr = '10.0.1.0/24'
             sn = net.create_subnet(cidr_block=cidr, name=subnet_name)
             with helpers.cleanup_action(lambda: sn.delete()):
-                # Does not work with moto until filter 'vpcId' for
-                # DescribeSubnets is not implemented.
-                # self.assertTrue(
-                #     sn.id in [s.id for s in net.subnets()],
-                #     "Subnet ID %s should be listed in network subnets %s."
-                #     % (sn.id, net.subnets()))
+                self.assertTrue(
+                    sn.id in [s.id for s in net.subnets()],
+                    "Subnet ID %s should be listed in network subnets %s."
+                    % (sn.id, net.subnets()))
 
                 self.assertIn(
                     net.id, sn.network_id,