From a2ac341e3db4270acd5abdc5bc20ebf0bdcc4510 Mon Sep 17 00:00:00 2001
From: sblumin <sblumin@ucsd.edu>
Date: Wed, 17 Jul 2019 16:37:47 -0700
Subject: [PATCH] added support to UPSERT records that are not simple routing
 policy

---
 moto/route53/models.py             |   2 +-
 tests/test_route53/test_route53.py | 108 +++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/moto/route53/models.py b/moto/route53/models.py
index 681a9d6ff..61a6609aa 100644
--- a/moto/route53/models.py
+++ b/moto/route53/models.py
@@ -198,7 +198,7 @@ class FakeZone(BaseModel):
     def upsert_rrset(self, record_set):
         new_rrset = RecordSet(record_set)
         for i, rrset in enumerate(self.rrsets):
-            if rrset.name == new_rrset.name and rrset.type_ == new_rrset.type_:
+            if rrset.name == new_rrset.name and rrset.type_ == new_rrset.type_ and rrset.set_identifier == new_rrset.set_identifier:
                 self.rrsets[i] = new_rrset
                 break
         else:
diff --git a/tests/test_route53/test_route53.py b/tests/test_route53/test_route53.py
index ca652af88..de9465d6d 100644
--- a/tests/test_route53/test_route53.py
+++ b/tests/test_route53/test_route53.py
@@ -652,6 +652,114 @@ def test_change_resource_record_sets_crud_valid():
     response = conn.list_resource_record_sets(HostedZoneId=hosted_zone_id)
     len(response['ResourceRecordSets']).should.equal(0)
 
+@mock_route53
+def test_change_weighted_resource_record_sets():
+    conn = boto3.client('route53', region_name='us-east-2')
+    conn.create_hosted_zone(
+        Name='test.vpc.internal.',
+        CallerReference=str(hash('test'))
+    )
+
+    zones = conn.list_hosted_zones_by_name(
+        DNSName='test.vpc.internal.'
+    )
+
+    hosted_zone_id = zones['HostedZones'][0]['Id']
+
+    #Create 2 weighted records
+    conn.change_resource_record_sets(
+        HostedZoneId=hosted_zone_id,
+        ChangeBatch={
+            'Changes': [
+                {
+                    'Action': 'CREATE',
+                    'ResourceRecordSet': {
+                        'Name': 'test.vpc.internal',
+                        'Type': 'A',
+                        'SetIdentifier': 'test1',
+                        'Weight': 50,
+                        'AliasTarget': {
+                            'HostedZoneId': 'Z3AADJGX6KTTL2',
+                            'DNSName': 'internal-test1lb-447688172.us-east-2.elb.amazonaws.com.',
+                            'EvaluateTargetHealth': True
+                        }
+                    }
+                },
+
+                {
+                    'Action': 'CREATE',
+                    'ResourceRecordSet': {
+                        'Name': 'test.vpc.internal',
+                        'Type': 'A',
+                        'SetIdentifier': 'test2',
+                        'Weight': 50,
+                        'AliasTarget': {
+                            'HostedZoneId': 'Z3AADJGX6KTTL2',
+                            'DNSName': 'internal-testlb2-1116641781.us-east-2.elb.amazonaws.com.',
+                            'EvaluateTargetHealth': True
+                        }
+                    }
+                }
+            ]
+        }
+    )
+
+    response = conn.list_resource_record_sets(HostedZoneId=hosted_zone_id)
+    record = response['ResourceRecordSets'][0]
+    #Update the first record to have a weight of 90
+    conn.change_resource_record_sets(
+        HostedZoneId=hosted_zone_id,
+        ChangeBatch={
+            'Changes' : [
+                {
+                    'Action' : 'UPSERT',
+                    'ResourceRecordSet' : {
+                        'Name' : record['Name'],
+                        'Type' : record['Type'],
+                        'SetIdentifier' : record['SetIdentifier'],
+                        'Weight' : 90,
+                        'AliasTarget' : {
+                            'HostedZoneId' : record['AliasTarget']['HostedZoneId'],
+                            'DNSName' : record['AliasTarget']['DNSName'],
+                            'EvaluateTargetHealth' : record['AliasTarget']['EvaluateTargetHealth']
+                        }
+                    }
+                },
+            ]
+        }
+    )
+
+    record = response['ResourceRecordSets'][1]
+    #Update the second record to have a weight of 10
+    conn.change_resource_record_sets(
+        HostedZoneId=hosted_zone_id,
+        ChangeBatch={
+            'Changes' : [
+                {
+                    'Action' : 'UPSERT',
+                    'ResourceRecordSet' : {
+                        'Name' : record['Name'],
+                        'Type' : record['Type'],
+                        'SetIdentifier' : record['SetIdentifier'],
+                        'Weight' : 10,
+                        'AliasTarget' : {
+                            'HostedZoneId' : record['AliasTarget']['HostedZoneId'],
+                            'DNSName' : record['AliasTarget']['DNSName'],
+                            'EvaluateTargetHealth' : record['AliasTarget']['EvaluateTargetHealth']
+                        }
+                    }
+                },
+            ]
+        }
+    )
+
+    response = conn.list_resource_record_sets(HostedZoneId=hosted_zone_id)
+    for record in response['ResourceRecordSets']:
+        if record['SetIdentifier'] == 'test1':
+            record['Weight'].should.equal(90)
+        if record['SetIdentifier'] == 'test2':
+            record['Weight'].should.equal(10)
+
 
 @mock_route53
 def test_change_resource_record_invalid():