Cleanup the default region backends.

This commit is contained in:
Steve Pulec 2014-11-15 14:21:58 -05:00
parent 2a61ef6f91
commit 1f8253a1a1
12 changed files with 17 additions and 18 deletions

View File

@ -1,7 +1,9 @@
from __future__ import unicode_literals
from .models import autoscaling_backend, autoscaling_backends # flake8: noqa
from .models import autoscaling_backends
from ..core.models import MockAWS
autoscaling_backend = autoscaling_backends['us-east-1']
def mock_autoscaling(func=None):
if func:

View File

@ -359,6 +359,3 @@ class AutoScalingBackend(BaseBackend):
autoscaling_backends = {}
for region, ec2_backend in ec2_backends.items():
autoscaling_backends[region] = AutoScalingBackend(ec2_backend)
autoscaling_backend = autoscaling_backends['us-east-1']
default_autoscaling_backend = autoscaling_backend

View File

@ -1,7 +1,9 @@
from __future__ import unicode_literals
from .models import cloudformation_backends, cloudformation_backend # flake8: noqa
from .models import cloudformation_backends
from ..core.models import MockAWS
cloudformation_backend = cloudformation_backends['us-east-1']
def mock_cloudformation(func=None):
if func:

View File

@ -101,5 +101,3 @@ class CloudFormationBackend(BaseBackend):
cloudformation_backends = {}
for region in boto.cloudformation.regions():
cloudformation_backends[region.name] = CloudFormationBackend()
cloudformation_backend = cloudformation_backends['us-east-1']

View File

@ -215,7 +215,7 @@ class ResourceMap(collections.Mapping):
self[resource]
if isinstance(self[resource], ec2_models.TaggedEC2Resource):
tags['aws:cloudformation:logical-id'] = resource
ec2_models.ec2_backend.create_tags([self[resource].physical_resource_id], tags)
ec2_models.ec2_backends[self._region_name].create_tags([self[resource].physical_resource_id], tags)
class OutputMap(collections.Mapping):

View File

@ -1,7 +1,9 @@
from __future__ import unicode_literals
from .models import ec2_backend, ec2_backends # flake8: noqa
from .models import ec2_backends
from ..core.models import MockAWS
ec2_backend = ec2_backends['us-east-1']
def mock_ec2(func=None):
if func:

View File

@ -2337,5 +2337,3 @@ class EC2Backend(BaseBackend, InstanceBackend, TagBackend, AmiBackend,
ec2_backends = {}
for region in boto.ec2.regions():
ec2_backends[region.name] = EC2Backend()
ec2_backend = ec2_backends['us-east-1']

View File

@ -1,7 +1,9 @@
from __future__ import unicode_literals
from .models import elb_backends, elb_backend # flake8: noqa
from .models import elb_backends
from ..core.models import MockAWS
elb_backend = elb_backends['us-east-1']
def mock_elb(func=None):
if func:

View File

@ -155,5 +155,3 @@ class ELBBackend(BaseBackend):
elb_backends = {}
for region in boto.ec2.elb.regions():
elb_backends[region.name] = ELBBackend()
elb_backend = elb_backends['us-east-1']

View File

@ -6,7 +6,7 @@ import six
from moto.core import BaseBackend
from moto.core.utils import iso_8601_datetime
from moto.sqs.models import sqs_backend
from moto.sqs import sqs_backend
from .utils import make_arn_for_topic, make_arn_for_subscription
DEFAULT_ACCOUNT_ID = 123456789012

View File

@ -1,7 +1,9 @@
from __future__ import unicode_literals
from .models import sqs_backends, sqs_backend # flake8: noqa
from .models import sqs_backends
from ..core.models import MockAWS
sqs_backend = sqs_backends['us-east-1']
def mock_sqs(func=None):
if func:

View File

@ -277,5 +277,3 @@ class SQSBackend(BaseBackend):
sqs_backends = {}
for region in boto.sqs.regions():
sqs_backends[region.name] = SQSBackend()
sqs_backend = sqs_backends['us-east-1']