Fixes for aws tests

cloudbridge/providers/aws/resources.py

@@ -1011,8 +1011,8 @@ class AWSNetwork(BaseNetwork):
                     wait=tenacity.wait_fixed(5),
                     reraise=True)
     def _wait_for_vpc(self):
-        self._provider.ec2_conn.meta.client.get_waiter('vpc_available').wait(
-            VpcIds=[self.id])
+        self._vpc.wait_until_exists()
+        self._vpc.wait_until_available()
 
     def wait_till_ready(self, timeout=None, interval=None):
         self._wait_for_vpc()

cloudbridge/providers/aws/services.py

@@ -35,6 +35,7 @@ from cloudbridge.base.services import BaseVMFirewallRuleService
 from cloudbridge.base.services import BaseVMFirewallService
 from cloudbridge.base.services import BaseVMTypeService
 from cloudbridge.base.services import BaseVolumeService
+from cloudbridge.interfaces import TestMockHelperMixin
 from cloudbridge.interfaces.exceptions import DuplicateResourceException
 from cloudbridge.interfaces.exceptions import \
     InvalidConfigurationException
@@ -205,6 +206,10 @@ class AWSVMFirewallService(BaseVMFirewallService):
                                   },
                               ]
                               )
+        # workaround bug in moto security groups which doesn't yet support TagSpecifications
+        if isinstance(self.provider, TestMockHelperMixin):
+            obj.label = label
+            obj.description = description
         return obj
 
     @dispatch(event="provider.security.vm_firewalls.find",