tempest: Don't hardcode the network name
Change-Id: I7c8478d96c9a1766e16c21375d0141f386999a78
diff --git a/ceilometer/tests/integration/gabbi/gabbits-live/create_stack.json b/ceilometer/tests/integration/gabbi/gabbits-live/create_stack.json
index 5078d06..91f7daf 100644
--- a/ceilometer/tests/integration/gabbi/gabbits-live/create_stack.json
+++ b/ceilometer/tests/integration/gabbi/gabbits-live/create_stack.json
@@ -12,7 +12,7 @@
"resource": {
"type": "OS::Nova::Server",
"properties": {
- "networks": [{ "network": "private" }],
+ "networks": [{ "network": "$ENVIRON['NEUTRON_NETWORK']" }],
"flavor": "$ENVIRON['NOVA_FLAVOR_REF']",
"image": "$ENVIRON['GLANCE_IMAGE_NAME']",
"metadata": {
diff --git a/ceilometer/tests/integration/gabbi/gabbits-live/update_stack.json b/ceilometer/tests/integration/gabbi/gabbits-live/update_stack.json
index 2ba9b53..de0fce6 100644
--- a/ceilometer/tests/integration/gabbi/gabbits-live/update_stack.json
+++ b/ceilometer/tests/integration/gabbi/gabbits-live/update_stack.json
@@ -11,7 +11,7 @@
"resource": {
"type": "OS::Nova::Server",
"properties": {
- "networks": [{ "network": "private" }],
+ "networks": [{ "network": "$ENVIRON['NEUTRON_NETWORK']" }],
"flavor": "$ENVIRON['NOVA_FLAVOR_REF']",
"image": "$ENVIRON['GLANCE_IMAGE_NAME']",
"metadata": {
diff --git a/ceilometer/tests/tempest/scenario/test_telemetry_integration.py b/ceilometer/tests/tempest/scenario/test_telemetry_integration.py
index 0afef2f..8e20e4f 100644
--- a/ceilometer/tests/tempest/scenario/test_telemetry_integration.py
+++ b/ceilometer/tests/tempest/scenario/test_telemetry_integration.py
@@ -76,6 +76,8 @@
def _do_test(self, filename):
auth = self.os_admin.auth_provider.get_auth()
+ networks = self.manager.networks_client.list_networks(
+ **{'router:external': False, 'fields': 'id'})['networks']
os.environ.update({
"ADMIN_TOKEN": auth[0],
@@ -87,6 +89,7 @@
"GLANCE_SERVICE_URL": self._get_endpoint(auth, "image"),
"GLANCE_IMAGE_NAME": self.glance_image_create(),
"NOVA_FLAVOR_REF": config.CONF.compute.flavor_ref,
+ "NEUTRON_NETWORK": networks[0].get('id'),
})
with file(os.path.join(TEST_DIR, filename)) as f: