Merge lp:~abentley/juju-release-tools/lowercase-azure-regions into lp:juju-release-tools

[Aaron Bentley]

Use location name as region instead of display name.

This branch changes the region for azure-ARM to be the location name.

Old Azure's simplestreams used the display name, a value with capital letters and spaces. Andrew Wilkins has asked us to use the actual location name, which is the same value users might enter at the commandline when bootstrapping.

Given that old-Azure and Azure-ARM seem to be completely different when it comes to simplestreams, this seems like a reasonable request to me.

[lp:~abentley/juju-release-tools/lowercase-azure-regions]

326. By Aaron Bentley on 2016-07-22

Merge trunk.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'azure_image_streams.py'
--- azure_image_streams.py	2016-07-22 16:17:08 +0000
+++ azure_image_streams.py	2016-07-22 19:43:09 +0000
@@ -33,32 +33,32 @@
 
 
 ITEM_NAMES = {
-    "Australia East": "auee1i3",
-    "Australia Southeast": "ause1i3",
-    "Brazil South": "brss1i3",
-    "Canada Central": "cacc1i3",
-    "Canada East": "caee1i3",
-    "Central India": "incc1i3",
-    "Central US": "uscc1i3",
-    "China East": "cnee1i3",
-    "China North": "cnnn1i3",
-    "East Asia": "asee1i3",
-    "East US 2": "usee2i3",
-    "East US": "usee1i3",
-    "Japan East": "jpee1i3",
-    "Japan West": "jpww1i3",
-    "North Central US": "usnc1i3",
-    "North Europe": "eunn1i3",
-    "South Central US": "ussc1i3",
-    "Southeast Asia": "asse1i3",
-    "South India": "inss1i3",
-    "UK North": "gbnn1i3",
-    "UK South 2": "gbss2i3",
-    "West Central US": "uswc1i3",
-    "West Europe": "euww1i3",
-    "West India": "inww1i3",
-    "West US 2": "usww2i3",
-    "West US": "usww1i3",
+    "australiaeast": "auee1i3",
+    "australiasoutheast": "ause1i3",
+    "brazilsouth": "brss1i3",
+    "canadacentral": "cacc1i3",
+    "canadaeast": "caee1i3",
+    "centralindia": "incc1i3",
+    "centralus": "uscc1i3",
+    "chinaeast": "cnee1i3",
+    "chinanorth": "cnnn1i3",
+    "eastasia": "asee1i3",
+    "eastus2": "usee2i3",
+    "eastus": "usee1i3",
+    "japaneast": "jpee1i3",
+    "japanwest": "jpww1i3",
+    "northcentralus": "usnc1i3",
+    "northeurope": "eunn1i3",
+    "southcentralus": "ussc1i3",
+    "southeastasia": "asse1i3",
+    "southindia": "inss1i3",
+    "uknorth": "gbnn1i3",
+    "uksouth2": "gbss2i3",
+    "westcentralus": "uswc1i3",
+    "westeurope": "euww1i3",
+    "westindia": "inww1i3",
+    "westus2": "usww2i3",
+    "westus": "usww1i3",
 }
 
 
@@ -143,11 +143,11 @@
         return True
 
 
-def convert_item_to_arm(item, urn, endpoint):
+def convert_item_to_arm(item, urn, endpoint, region):
     """Return the ARM equivalent of an item, given a urn + endpoint."""
     data = dict(item.data)
     data.pop('crsn', None)
-    data.update({'id': urn, 'endpoint': endpoint})
+    data.update({'id': urn, 'endpoint': endpoint, 'region': region})
     return Item(item.content_id, item.product_name, item.version_name,
                 item.item_name, data=data)
 
@@ -186,7 +186,7 @@
         if (sku, version) in EXPECTED_MISSING:
             raise UnexpectedImage(
                 'Unexpectedly found {} in {}\n'.format(urn, location))
-        arm_items.append(convert_item_to_arm(item, urn, endpoint))
+        arm_items.append(convert_item_to_arm(item, urn, endpoint, location))
     return arm_items, unknown_locations
 
 
@@ -212,7 +212,7 @@
             continue
         for version in versions:
             location_versions.setdefault(
-                version.name, set()).add(location.display_name)
+                version.name, set()).add(location.name)
     lv2 = sorted(location_versions.items(), key=lambda x: [
         int(ns) for ns in x[0].split('.')])
     for num, (version, v_locations) in enumerate(lv2):
 
=== modified file 'tests/test_azure_image_streams.py'
--- tests/test_azure_image_streams.py	2016-07-22 16:17:08 +0000
+++ tests/test_azure_image_streams.py	2016-07-22 19:43:09 +0000
@@ -164,19 +164,19 @@
     def test_convert_item_to_arm(self, item_id=None):
         item = make_old_item(item_id)
         arm_item = convert_item_to_arm(
-            item, 'ww:xx:yy:zz', 'http://example.com/arm')
+            item, 'ww:xx:yy:zz', 'http://example.com/arm', 'westeros')
         self.assertEqual(arm_item, Item('aa', 'bb', 'cc', '99', {
             'id': 'ww:xx:yy:zz',
             'foo': 'bar',
             'endpoint': 'http://example.com/arm',
-            'region': 'Westeros',
+            'region': 'westeros',
             }))
 
     def test_discard_crsn(self):
         item = make_old_item()
         item.data['crsn'] = 'asdf'
         arm_item = convert_item_to_arm(
-            item, 'ww:xx:yy:zz', 'http://example.com/arm')
+            item, 'ww:xx:yy:zz', 'http://example.com/arm', 'westeros')
         self.assertNotIn('crsn', arm_item.data)
 
 
@@ -187,7 +187,8 @@
     sku, version = parse_id(old_item.data['id'])
     full_spec = (CANONICAL, UBUNTU_SERVER, sku, version)
     urn = ':'.join(full_spec)
-    expected_item = convert_item_to_arm(old_item, urn, endpoint)
+    arm_region = old_item.data['region'].lower().replace(' ', '')
+    expected_item = convert_item_to_arm(old_item, urn, endpoint, arm_region)
     return old_item, full_spec, expected_item
 
 
@@ -243,7 +244,7 @@
         offer = 'CentOS' if centos else 'bar'
         release = 'centos7' if centos else 'win95'
         full_spec = (release, 'foo', offer, 'baz')
-        region_name = 'Canada East'
+        region_name = 'canadaeast'
         endpoint = 'http://example.org'
         return make_item('1', 'pete', full_spec, region_name, endpoint)
 
@@ -256,7 +257,7 @@
             'caee1i3', {
                 'arch': 'amd64',
                 'virt': 'Hyper-V',
-                'region': 'Canada East',
+                'region': 'canadaeast',
                 'id': 'foo:bar:baz:pete',
                 'label': 'release',
                 'endpoint': 'http://example.org',
@@ -272,7 +273,7 @@
             'caee1i3', {
                 'arch': 'amd64',
                 'virt': 'Hyper-V',
-                'region': 'Canada East',
+                'region': 'canadaeast',
                 'id': 'foo:CentOS:baz:pete',
                 'label': 'release',
                 'endpoint': 'http://example.org',
@@ -304,10 +305,10 @@
     expected_items = []
     expected_calls = []
     for spec in specs:
-        expected_calls.append(call('region1', *spec[1:]))
+        expected_calls.append(call('canadaeast', *spec[1:]))
         for num, version in enumerate(versions):
             expected_items.append(
-                make_item(str(num), version, spec, 'Canada East',
+                make_item(str(num), version, spec, 'canadaeast',
                           client.config.base_url))
     return expected_calls, expected_items
 
@@ -316,7 +317,7 @@
 
     def test_make_spec_items(self):
         client = mock_compute_client(['1', '2'])
-        locations = [mock_location('region1', 'Canada East')]
+        locations = [mock_location('canadaeast', 'Canada East')]
         items = list(make_spec_items(client, IMAGE_SPEC[0], locations))
         expected_calls, expected_items = make_expected(
             client, ['1', '2'], [IMAGE_SPEC[0]])