catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update ec2 calls for boto 2.5 compat

Browse source
This commit is contained in:
Steve Pulec 2013-02-28 00:08:35 -05:00
commit 98fc1eeab9
4 changed files with 44 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

24
moto/ec2/models.py
View file

@ -1,6 +1,6 @@
from collections import defaultdict
from boto.ec2.instance import Instance, InstanceState, Reservation
from boto.ec2.instance import Instance as BotoInstance, Reservation
from moto.core import BaseBackend
from .utils import (
@ -13,6 +13,13 @@ from .utils import (
)
class Instance(BotoInstance):
def __init__(self):
self._state_name = None
self._state_code = None
super(Instance, self).__init__()
class InstanceBackend(object):
def __init__(self):
@ -30,7 +37,8 @@ class InstanceBackend(object):
for index in range(count):
new_instance = Instance()
new_instance.id = random_instance_id()
new_instance._state = InstanceState(0, "pending")
new_instance._state_name = "pending"
new_instance._state_code = 0
new_reservation.instances.append(new_instance)
self.reservations[new_reservation.id] = new_reservation
return new_reservation
@ -39,7 +47,8 @@ class InstanceBackend(object):
started_instances = []
for instance in self.all_instances():
if instance.id in instance_ids:
instance._state = InstanceState(0, 'pending')
instance._state_name = "pending"
instance._state_code = 0
started_instances.append(instance)
return started_instances
@ -48,7 +57,8 @@ class InstanceBackend(object):
stopped_instances = []
for instance in self.all_instances():
if instance.id in instance_ids:
instance._state = InstanceState(64, 'stopping')
instance._state_name = "stopping"
instance._state_code = 64
stopped_instances.append(instance)
return stopped_instances
@ -57,7 +67,8 @@ class InstanceBackend(object):
terminated_instances = []
for instance in self.all_instances():
if instance.id in instance_ids:
instance._state = InstanceState(32, 'shutting-down')
instance._state_name = "shutting-down"
instance._state_code = 32
terminated_instances.append(instance)
return terminated_instances
@ -67,7 +78,8 @@ class InstanceBackend(object):
for instance in self.all_instances():
if instance.id in instance_ids:
# TODO double check instances go to pending when reboot
instance._state = InstanceState(0, 'pending')
instance._state_name = "pending"
instance._state_code = 0
rebooted_instances.append(instance)
return rebooted_instances