| commit | b8a5814fd9d357a52eb0d4f2d5f973db518becb8 | [log] [tgz] |
|---|---|---|
| author | Kyle Mestery <mestery@mestery.com> | Fri Jul 31 13:41:15 2015 +0000 |
| committer | Kyle Mestery <mestery@mestery.com> | Fri Jul 31 13:41:50 2015 +0000 |
| tree | c238becda849d8a8e2891862d6634376ddbd1e93 | |
| parent | 9e7b4c5fc072b50ba61682d3b8bc8a8d016ec967 [diff] | |
| parent | 83350346d1d7bdd5df283754e93ef244456d9dc6 [diff] |
Merge remote-tracking branch 'origin/master' into merge-branch Change-Id: I42fb51c428c5ddf39501b9dc1792add62206f4d6
diff --git a/neutron/tests/tempest/services/network/json/network_client.py b/neutron/tests/tempest/services/network/json/network_client.py index 54f264c..4958bc5 100644 --- a/neutron/tests/tempest/services/network/json/network_client.py +++ b/neutron/tests/tempest/services/network/json/network_client.py
@@ -45,7 +45,7 @@ # The following list represents resource names that do not require # changing underscore to a hyphen hyphen_exceptions = ["health_monitors", "firewall_rules", - "firewall_policies"] + "firewall_policies", "service_profiles"] # the following map is used to construct proper URI # for the given neutron resource service_resource_prefix_map = {