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

Merge branch 'master' of github.com:behanceops/moto into feature-instance-launch-time

Browse source 
Conflicts:
	moto/ec2/models.py
This commit is contained in:
Chris Henry 2015-01-18 16:37:27 -05:00
commit 1f2a913d3a
11 changed files with 629 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
moto/ec2/models.py
View file

@ -299,7 +299,11 @@ class Instance(BotoInstance, TaggedEC2Resource):
self.subnet_id = kwargs.get("subnet_id")
self.key_name = kwargs.get("key_name")
self.source_dest_check = "true"
<<<<<<< HEAD
self.launch_time = datetime.now().isoformat()
=======
self.private_ip_address = kwargs.get('private_ip_address')
>>>>>>> c22ea3014b8d2068696ef246e90bd9ec8ec90b91
self.block_device_mapping = BlockDeviceMapping()
self.block_device_mapping['/dev/sda1'] = BlockDeviceType(volume_id=random_volume_id())
@ -345,6 +349,7 @@ class Instance(BotoInstance, TaggedEC2Resource):
instance_type=properties.get("InstanceType", "m1.small"),
subnet_id=properties.get("SubnetId"),
key_name=properties.get("KeyName"),
private_ip_address=properties.get('PrivateIpAddress'),
)
return reservation.instances[0]