From ae6f9dcb71f8c4d3231540daeda09706d0045710 Mon Sep 17 00:00:00 2001
From: Terry Cain <terry@terrys-home.co.uk>
Date: Sat, 21 Oct 2017 22:10:45 +0100
Subject: [PATCH 1/2] Fixes #1282

---
 moto/route53/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/moto/route53/models.py b/moto/route53/models.py
index d12f4ee7a..f0e52086d 100644
--- a/moto/route53/models.py
+++ b/moto/route53/models.py
@@ -209,7 +209,7 @@ class FakeZone(BaseModel):
 
     @property
     def physical_resource_id(self):
-        return self.name
+        return self.id
 
     @classmethod
     def create_from_cloudformation_json(cls, resource_name, cloudformation_json, region_name):

From f247cd0f489dc44dc1072ff8323d3a913eb8a476 Mon Sep 17 00:00:00 2001
From: Terry Cain <terry@terrys-home.co.uk>
Date: Sat, 21 Oct 2017 22:41:19 +0100
Subject: [PATCH 2/2] Fixed uses of HostedZone

---
 .../route53_ec2_instance_with_public_ip.py        | 13 ++++++++++---
 .../fixtures/route53_health_check.py              |  2 +-
 .../fixtures/route53_roundrobin.py                | 15 +++++++++++----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/tests/test_cloudformation/fixtures/route53_ec2_instance_with_public_ip.py b/tests/test_cloudformation/fixtures/route53_ec2_instance_with_public_ip.py
index 5e66bbd86..43a11104b 100644
--- a/tests/test_cloudformation/fixtures/route53_ec2_instance_with_public_ip.py
+++ b/tests/test_cloudformation/fixtures/route53_ec2_instance_with_public_ip.py
@@ -1,6 +1,13 @@
 from __future__ import unicode_literals
 
 template = {
+    "Parameters": {
+        "R53ZoneName": {
+            "Type": "String",
+            "Default": "my_zone"
+        }
+    },
+
     "Resources": {
         "Ec2Instance": {
             "Type": "AWS::EC2::Instance",
@@ -13,20 +20,20 @@ template = {
         "HostedZone": {
             "Type": "AWS::Route53::HostedZone",
             "Properties": {
-                "Name": "my_zone"
+                "Name": {"Ref": "R53ZoneName"}
             }
         },
 
         "myDNSRecord": {
             "Type": "AWS::Route53::RecordSet",
             "Properties": {
-                "HostedZoneName": {"Ref": "HostedZone"},
+                "HostedZoneId": {"Ref": "HostedZone"},
                 "Comment": "DNS name for my instance.",
                 "Name": {
                     "Fn::Join": ["", [
                         {"Ref": "Ec2Instance"}, ".",
                         {"Ref": "AWS::Region"}, ".",
-                        {"Ref": "HostedZone"}, "."
+                        {"Ref": "R53ZoneName"}, "."
                     ]]
                 },
                 "Type": "A",
diff --git a/tests/test_cloudformation/fixtures/route53_health_check.py b/tests/test_cloudformation/fixtures/route53_health_check.py
index f6a2c9b8e..420cd38ba 100644
--- a/tests/test_cloudformation/fixtures/route53_health_check.py
+++ b/tests/test_cloudformation/fixtures/route53_health_check.py
@@ -26,7 +26,7 @@ template = {
         "myDNSRecord": {
             "Type": "AWS::Route53::RecordSet",
             "Properties": {
-                "HostedZoneName": {"Ref": "HostedZone"},
+                "HostedZoneId": {"Ref": "HostedZone"},
                 "Comment": "DNS name for my instance.",
                 "Name": "my_record_set",
                 "Type": "A",
diff --git a/tests/test_cloudformation/fixtures/route53_roundrobin.py b/tests/test_cloudformation/fixtures/route53_roundrobin.py
index da4fecd4d..199e3e088 100644
--- a/tests/test_cloudformation/fixtures/route53_roundrobin.py
+++ b/tests/test_cloudformation/fixtures/route53_roundrobin.py
@@ -5,30 +5,37 @@ template = {
 
     "Description": "AWS CloudFormation Sample Template Route53_RoundRobin: Sample template showing how to use weighted round robin (WRR) DNS entried via Amazon Route 53. This contrived sample uses weighted CNAME records to illustrate that the weighting influences the return records. It assumes that you already have a Hosted Zone registered with Amazon Route 53. **WARNING** This template creates one or more AWS resources. You will be billed for the AWS resources used if you create a stack from this template.",
 
+    "Parameters": {
+        "R53ZoneName": {
+            "Type": "String",
+            "Default": "my_zone"
+        }
+    },
+
     "Resources": {
 
         "MyZone": {
             "Type": "AWS::Route53::HostedZone",
             "Properties": {
-                "Name": "my_zone"
+                "Name": {"Ref": "R53ZoneName"}
             }
         },
 
         "MyDNSRecord": {
             "Type": "AWS::Route53::RecordSetGroup",
             "Properties": {
-                "HostedZoneName": {"Ref": "MyZone"},
+                "HostedZoneId": {"Ref": "MyZone"},
                 "Comment": "Contrived example to redirect to aws.amazon.com 75% of the time and www.amazon.com 25% of the time.",
                 "RecordSets": [{
                     "SetIdentifier": {"Fn::Join": [" ", [{"Ref": "AWS::StackName"}, "AWS"]]},
-                    "Name": {"Fn::Join": ["", [{"Ref": "AWS::StackName"}, ".", {"Ref": "AWS::Region"}, ".", {"Ref": "MyZone"}, "."]]},
+                    "Name": {"Fn::Join": ["", [{"Ref": "AWS::StackName"}, ".", {"Ref": "AWS::Region"}, ".", {"Ref": "R53ZoneName"}, "."]]},
                     "Type": "CNAME",
                     "TTL": "900",
                     "ResourceRecords": ["aws.amazon.com"],
                     "Weight": "3"
                 }, {
                     "SetIdentifier": {"Fn::Join": [" ", [{"Ref": "AWS::StackName"}, "Amazon"]]},
-                    "Name": {"Fn::Join": ["", [{"Ref": "AWS::StackName"}, ".", {"Ref": "AWS::Region"}, ".", {"Ref": "MyZone"}, "."]]},
+                    "Name": {"Fn::Join": ["", [{"Ref": "AWS::StackName"}, ".", {"Ref": "AWS::Region"}, ".", {"Ref": "R53ZoneName"}, "."]]},
                     "Type": "CNAME",
                     "TTL": "900",
                     "ResourceRecords": ["www.amazon.com"],