Merge lp:~nskaggs/juju-ci-tools/fix-1589645 into lp:juju-ci-tools

[Nicholas Skaggs]

functional-resources needs to support applicationid

[Aaron Bentley (abentley)]

This breaks compatibility with beta8 and earlier. Please support both "serviceid" and "applicationId".

review: Needs Fixing

[lp:~nskaggs/juju-ci-tools/fix-1589645]

1458. By Nicholas Skaggs on 2016-06-07

support serviceid too

[Aaron Bentley (abentley)]

Looks good.

review: Approve

=== modified file 'assess_resources.py'
--- assess_resources.py	2016-05-24 22:42:10 +0000
+++ assess_resources.py	2016-06-07 20:11:00 +0000
@@ -23,10 +23,10 @@
 log = logging.getLogger("assess_resources")
 
 
-def _resource_info(name, fingerprint, size):
+def _resource_info(name, fingerprint, size, service_app_id):
     data = {}
     data['resourceid'] = "dummy-resource/{}".format(name)
-    data['serviceid'] = 'dummy-resource'
+    data[service_app_id] = 'dummy-resource'
     data['name'] = name
     data['type'] = 'file'
     data['description'] = '{} resource.'.format(name)
@@ -43,7 +43,12 @@
     resources = status['resources']
     for resource in resources:
         if resource['expected']['resourceid'] == resource_id:
-            expected_values = _resource_info(name, fingerprint, size)
+            if 'serviceid' in resource['unit']:
+                service_app_id = 'serviceid'
+            else:
+                service_app_id = 'applicationId'
+            expected_values = _resource_info(name, fingerprint,
+                                             size, service_app_id)
             if resource['expected'] != expected_values:
                 raise JujuAssertionError(
                     'Unexpected resource list values: {} Expected: {}'.format(

=== modified file 'tests/test_assess_resources.py'
--- tests/test_assess_resources.py	2016-05-24 22:42:10 +0000
+++ tests/test_assess_resources.py	2016-06-07 20:11:00 +0000
@@ -67,6 +67,10 @@
         verify_status(
             make_resource_list(), 'dummy-resource/foo', 'foo', '1234', 27)
 
+    def test_verify_status_serviceid(self):
+        verify_status(make_resource_list('serviceid'), 'dummy-resource/foo',
+                      'foo', '1234', 27)
+
     def test_verify_status_exception(self):
         status = make_resource_list()
         status['resources'][0]['expected']['origin'] = 'charmstore'
@@ -213,17 +217,17 @@
         temp_env_name='an-env-mod', upload_tools=False, verbose=10)
 
 
-def make_resource_list():
+def make_resource_list(service_app_id='applicationId'):
     return {'resources': [{
         'expected': {
             'origin': 'upload', 'used': True, 'description': 'foo resource.',
             'username': 'admin@local', 'resourceid': 'dummy-resource/foo',
-            'name': 'foo', 'serviceid': 'dummy-resource', 'path': 'foo.txt',
-            'fingerprint': '1234', 'type': 'file', 'size': 27},
+            'name': 'foo', service_app_id: 'dummy-resource', 'size': 27,
+            'fingerprint': '1234', 'type': 'file', 'path': 'foo.txt'},
         'unit': {
             'origin': 'upload', 'username': 'admin@local', 'used': True,
             'name': 'foo', 'resourceid': 'dummy-resource/foo',
-            'serviceid': 'dummy-resource', 'fingerprint': '1234',
+            service_app_id: 'dummy-resource', 'fingerprint': '1234',
             'path': 'foo.txt', 'size': 27, 'type': 'file',
             'description': 'foo resource.'}}]}