From a63d7486173f3b717d35310ede5acfa87809deb2 Mon Sep 17 00:00:00 2001
From: Steve Pulec <spulec@gmail.com>
Date: Tue, 14 Jul 2015 23:39:06 -0400
Subject: [PATCH] Revert "Move RRSet parsing inside models so that
 cloudformation works better."

This reverts commit c7090a2b5404d5a2003419de4d97f4439cd83ff6.
---
 moto/route53/models.py    | 10 ----------
 moto/route53/responses.py |  9 +++++++++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/moto/route53/models.py b/moto/route53/models.py
index 05a9ec6d4..00e23c38e 100644
--- a/moto/route53/models.py
+++ b/moto/route53/models.py
@@ -113,16 +113,6 @@ class FakeZone(object):
         self.rrsets = []
 
     def add_rrset(self, record_set):
-        if 'ResourceRecords' in record_set:
-            resource_records = list(record_set['ResourceRecords'].values())[0]
-            if not isinstance(resource_records, list):
-                # Depending on how many records there are, this may or may not be a list
-                resource_records = [resource_records]
-            record_values = [x['Value'] for x in resource_records]
-        elif 'AliasTarget' in record_set:
-            record_values = [record_set['AliasTarget']['DNSName']]
-        record_set['ResourceRecords'] = record_values
-
         record_set = RecordSet(record_set)
         self.rrsets.append(record_set)
         return record_set
diff --git a/moto/route53/responses.py b/moto/route53/responses.py
index e2d40fc15..957ddb9c1 100644
--- a/moto/route53/responses.py
+++ b/moto/route53/responses.py
@@ -55,6 +55,15 @@ def rrset_response(request, full_url, headers):
             action = value['Action']
             record_set = value['ResourceRecordSet']
             if action == 'CREATE':
+                if 'ResourceRecords' in record_set:
+                    resource_records = list(record_set['ResourceRecords'].values())[0]
+                    if not isinstance(resource_records, list):
+                        # Depending on how many records there are, this may or may not be a list
+                        resource_records = [resource_records]
+                    record_values = [x['Value'] for x in resource_records]
+                elif 'AliasTarget' in record_set:
+                    record_values = [record_set['AliasTarget']['DNSName']]
+                record_set['ResourceRecords'] = record_values
                 the_zone.add_rrset(record_set)
             elif action == "DELETE":
                 if 'SetIdentifier' in record_set: