Merge "Makes api extension names consistent"

7 files changed, 11 insertions, 10 deletions

diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py
index 1ef773f57..953459d38 100644
--- a/nova/api/openstack/compute/contrib/console_output.py
+++ b/nova/api/openstack/compute/contrib/console_output.py
@@ -76,7 +76,7 @@ class ConsoleOutputController(wsgi.Controller):
 class Console_output(extensions.ExtensionDescriptor):
     """Console log output support, with tailing ability."""
 
-    name = "Console_output"
+    name = "ConsoleOutput"
     alias = "os-console-output"
     namespace = ("http://docs.openstack.org/compute/ext/"
                  "os-console-output/api/v2")
diff --git a/nova/api/openstack/compute/contrib/floating_ip_dns.py b/nova/api/openstack/compute/contrib/floating_ip_dns.py
index 2029ab2aa..667bec294 100644
--- a/nova/api/openstack/compute/contrib/floating_ip_dns.py
+++ b/nova/api/openstack/compute/contrib/floating_ip_dns.py
@@ -280,7 +280,7 @@ class FloatingIPDNSEntryController(object):
 class Floating_ip_dns(extensions.ExtensionDescriptor):
     """Floating IP DNS support"""
 
-    name = "Floating_ip_dns"
+    name = "FloatingIpDns"
     alias = "os-floating-ip-dns"
     namespace = "http://docs.openstack.org/ext/floating_ip_dns/api/v1.1"
     updated = "2011-12-23T00:00:00+00:00"
diff --git a/nova/api/openstack/compute/contrib/floating_ip_pools.py b/nova/api/openstack/compute/contrib/floating_ip_pools.py
index 216bc9091..abd422f0d 100644
--- a/nova/api/openstack/compute/contrib/floating_ip_pools.py
+++ b/nova/api/openstack/compute/contrib/floating_ip_pools.py
@@ -78,7 +78,7 @@ class FloatingIPPoolsController(object):
 class Floating_ip_pools(extensions.ExtensionDescriptor):
     """Floating IPs support"""
 
-    name = "Floating_ip_pools"
+    name = "FloatingIpPools"
     alias = "os-floating-ip-pools"
     namespace = ("http://docs.openstack.org/compute/ext/"
                  "floating_ip_pools/api/v1.1")
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py
index 6e3c24567..f3692e02e 100644
--- a/nova/api/openstack/compute/contrib/floating_ips.py
+++ b/nova/api/openstack/compute/contrib/floating_ips.py
@@ -297,7 +297,7 @@ class FloatingIPActionController(wsgi.Controller):
 class Floating_ips(extensions.ExtensionDescriptor):
     """Floating IPs support"""
 
-    name = "Floating_ips"
+    name = "FloatingIps"
     alias = "os-floating-ips"
     namespace = "http://docs.openstack.org/compute/ext/floating_ips/api/v1.1"
     updated = "2011-06-16T00:00:00+00:00"
diff --git a/nova/api/openstack/compute/contrib/used_limits.py b/nova/api/openstack/compute/contrib/used_limits.py
index 2a8d5d468..020f6d8e4 100644
--- a/nova/api/openstack/compute/contrib/used_limits.py
+++ b/nova/api/openstack/compute/contrib/used_limits.py
@@ -65,7 +65,7 @@ class UsedLimitsController(wsgi.Controller):
 class Used_limits(extensions.ExtensionDescriptor):
     """Provide data on limited resources that are being used."""
 
-    name = "Used Limits"
+    name = "UsedLimits"
     alias = ALIAS
     namespace = XMLNS
     updated = "2012-07-13T00:00:00+00:00"
diff --git a/nova/api/openstack/compute/contrib/virtual_interfaces.py b/nova/api/openstack/compute/contrib/virtual_interfaces.py
index f4f14dc82..1e5d0342d 100644
--- a/nova/api/openstack/compute/contrib/virtual_interfaces.py
+++ b/nova/api/openstack/compute/contrib/virtual_interfaces.py
@@ -80,7 +80,7 @@ class Virtual_interfaces(extensions.ExtensionDescriptor):
     """Virtual interface support"""
 
     name = "VirtualInterfaces"
-    alias = "virtual_interfaces"
+    alias = "os-virtual-interfaces"
     namespace = ("http://docs.openstack.org/compute/ext/"
                  "virtual_interfaces/api/v1.1")
     updated = "2011-08-17T00:00:00+00:00"
diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py
index 200f56a56..1a4d3902f 100644
--- a/nova/tests/api/openstack/compute/test_extensions.py
+++ b/nova/tests/api/openstack/compute/test_extensions.py
@@ -159,7 +159,7 @@ class ExtensionControllerTest(ExtensionTestCase):
             "AvailabilityZone",
             "Certificates",
             "Cloudpipe",
-            "Console_output",
+            "ConsoleOutput",
             "Consoles",
             "Createserverext",
             "DeferredDelete",
@@ -170,9 +170,9 @@ class ExtensionControllerTest(ExtensionTestCase):
             "FlavorExtraSpecs",
             "FlavorExtraData",
             "FlavorManage",
-            "Floating_ips",
-            "Floating_ip_dns",
-            "Floating_ip_pools",
+            "FloatingIps",
+            "FloatingIpDns",
+            "FloatingIpPools",
             "Fox In Socks",
             "Hosts",
             "Keypairs",
@@ -187,6 +187,7 @@ class ExtensionControllerTest(ExtensionTestCase):
             "ServerDiagnostics",
             "ServerStartStop",
             "SimpleTenantUsage",
+            "UsedLimits",
             "UserData",
             "VirtualInterfaces",
             "Volumes",