Merge ~chad.smith/cloud-init:tests/slow-openstack-datasource-tests into cloud-init:master

[Chad Smith]

tests: mock missed openstack metadata uri network_data.json

This missed mock in test_openstack resulted in a costly unit test timeout.

LP: #1714376

[Chad Smith (chad.smith)]

Leaving the overhaul of register_mock_metaserver for a separate branch which would consolidate AliYun, Ec2 and OpenStack tests to use the same httpretty mocking pattern.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:3bf90001d62ead9ffd01630f688fea021b0d63d0
https://jenkins.ubuntu.com/server/job/cloud-init-ci/261/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/261/rebuild

review: Approve (continuous-integration)

[Joshua Powers (powersj)]

Huge +1 to this change. Python2 tests now take 3.985 seconds and python3 tests take 4.147 seconds.

review: Approve

diff --git a/tests/unittests/test_datasource/test_openstack.py b/tests/unittests/test_datasource/test_openstack.py
index 177e980..ed367e0 100644
--- a/tests/unittests/test_datasource/test_openstack.py
+++ b/tests/unittests/test_datasource/test_openstack.py
@@ -57,6 +57,8 @@ OS_FILES = {
     'openstack/content/0000': CONTENT_0,
     'openstack/content/0001': CONTENT_1,
     'openstack/latest/meta_data.json': json.dumps(OSTACK_META),
+    'openstack/latest/network_data.json': json.dumps(
+        {'links': [], 'networks': [], 'services': []}),
     'openstack/latest/user_data': USER_DATA,
     'openstack/latest/vendor_data.json': json.dumps(VENDOR_DATA),
 }
@@ -68,6 +70,7 @@ EC2_VERSIONS = [
 ]
 
 
+# TODO _register_uris should leverage test_ec2.register_mock_metaserver.
 def _register_uris(version, ec2_files, ec2_meta, os_files):
     """Registers a set of url patterns into httpretty that will mimic the
     same data returned by the openstack metadata service (and ec2 service)."""