Add route53 ResourceSet to Cloudformation.

moto/cloudformation/parsing.py

@@ -38,6 +38,7 @@ MODEL_MAP = {
     "AWS::RDS::DBSecurityGroup": rds_models.SecurityGroup,
     "AWS::RDS::DBSubnetGroup": rds_models.SubnetGroup,
     "AWS::Route53::HostedZone": route53_models.FakeZone,
+    "AWS::Route53::RecordSet": route53_models.RecordSet,
     "AWS::Route53::RecordSetGroup": route53_models.RecordSetGroup,
     "AWS::SQS::Queue": sqs_models.Queue,
 }

moto/ec2/models.py

@@ -299,6 +299,7 @@ class Instance(BotoInstance, TaggedEC2Resource):
         self.subnet_id = kwargs.get("subnet_id")
         self.key_name = kwargs.get("key_name")
         self.source_dest_check = "true"
+        self.private_ip_address = kwargs.get('private_ip_address')
 
         self.block_device_mapping = BlockDeviceMapping()
         self.block_device_mapping['/dev/sda1'] = BlockDeviceType(volume_id=random_volume_id())
@@ -344,6 +345,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]
 

moto/route53/models.py

@@ -9,18 +9,31 @@ from moto.core.utils import get_random_hex
 class RecordSet(object):
     def __init__(self, kwargs):
         self.name = kwargs.get('Name')
-        self.type = kwargs.get('Type')
+        self._type = kwargs.get('Type')
         self.ttl = kwargs.get('TTL')
         self.records = kwargs.get('ResourceRecords', [])
         self.set_identifier = kwargs.get('SetIdentifier')
         self.weight = kwargs.get('Weight')
 
+    @classmethod
+    def create_from_cloudformation_json(cls, resource_name, cloudformation_json, region_name):
+        properties = cloudformation_json['Properties']
+
+        zone_name = properties["HostedZoneName"]
+        hosted_zone = route53_backend.get_hosted_zone_by_name(zone_name)
+        record_set = hosted_zone.add_rrset(properties)
+        return record_set
+
     def to_xml(self):
         template = Template("""<ResourceRecordSet>
                 <Name>{{ record_set.name }}</Name>
-                <Type>{{ record_set.type }}</Type>
-                <SetIdentifier>{{ record_set.set_identifier }}</SetIdentifier>
-                <Weight>{{ record_set.weight }}</Weight>
+                <Type>{{ record_set._type }}</Type>
+                {% if record_set.set_identifier %}
+                    <SetIdentifier>{{ record_set.set_identifier }}</SetIdentifier>
+                {% endif %}
+                {% if record_set.weight %}
+                    <Weight>{{ record_set.weight }}</Weight>
+                {% endif %}
                 <TTL>{{ record_set.ttl }}</TTL>
                 <ResourceRecords>
                     {% for record in record_set.records %}
@@ -44,6 +57,7 @@ class FakeZone(object):
     def add_rrset(self, record_set):
         record_set = RecordSet(record_set)
         self.rrsets.append(record_set)
+        return record_set
 
     def delete_rrset(self, name):
         self.rrsets = [record_set for record_set in self.rrsets if record_set.name != name]
@@ -51,7 +65,7 @@ class FakeZone(object):
     def get_record_sets(self, type_filter, name_filter):
         record_sets = list(self.rrsets)  # Copy the list
         if type_filter:
-            record_sets = [record_set for record_set in record_sets if record_set.type == type_filter]
+            record_sets = [record_set for record_set in record_sets if record_set._type == type_filter]
         if name_filter:
             record_sets = [record_set for record_set in record_sets if record_set.name == name_filter]