From 038565bdc735ff7a227a39d2ee21df0e8194929b Mon Sep 17 00:00:00 2001
From: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date: Tue, 19 Jul 2011 18:24:44 -0700
Subject: Modified alias ^Cd minor fixes

---
 bin/nova-manage                                          | 2 +-
 nova/api/openstack/contrib/createserverext.py            | 4 ++--
 nova/network/manager.py                                  | 1 -
 nova/tests/api/openstack/contrib/test_createserverext.py | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 47bf81008..7c2dd4d6d 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -621,7 +621,7 @@ class NetworkCommands(object):
 
     def list(self):
         """List all created networks"""
-        print "%-5s\%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % (_('id'),
+        print "%-5s\t%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % (_('id'),
                                                   _('network'),
                                                   _('netmask'),
                                                   _('start address'),
diff --git a/nova/api/openstack/contrib/createserverext.py b/nova/api/openstack/contrib/createserverext.py
index 78dba425a..2f8b4389f 100644
--- a/nova/api/openstack/contrib/createserverext.py
+++ b/nova/api/openstack/contrib/createserverext.py
@@ -205,7 +205,7 @@ class Createserverext(extensions.ExtensionDescriptor):
         return "Createserverext"
 
     def get_alias(self):
-        return "os-servers-create-ext"
+        return "os-create-server-ext"
 
     def get_description(self):
         return "Extended support to the Create Server v1.1 API"
@@ -234,7 +234,7 @@ class Createserverext(extensions.ExtensionDescriptor):
                                              headers_serializer)
         deserializer = wsgi.RequestDeserializer(body_deserializers)
 
-        res = extensions.ResourceExtension('os-servers-create-ext',
+        res = extensions.ResourceExtension('os-create-server-ext',
                                         controller=CreateServerExtController(),
                                         deserializer=deserializer,
                                         serializer=serializer)
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 349faa84d..27ea669b4 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -614,7 +614,6 @@ class NetworkManager(manager.SchedulerDependentManager):
             net['gateway'] = str(project_net[1])
             net['broadcast'] = str(project_net.broadcast)
             net['dhcp_start'] = str(project_net[2])
-            net['project_id'] = kwargs['project_id']
             if num_networks > 1:
                 net['label'] = '%s_%d' % (label, index)
             else:
diff --git a/nova/tests/api/openstack/contrib/test_createserverext.py b/nova/tests/api/openstack/contrib/test_createserverext.py
index f2aa136e2..5d1687ee9 100644
--- a/nova/tests/api/openstack/contrib/test_createserverext.py
+++ b/nova/tests/api/openstack/contrib/test_createserverext.py
@@ -290,7 +290,7 @@ class CreateserverextTest(test.TestCase):
         return {'server': server}
 
     def _get_create_request_json(self, body_dict):
-        req = webob.Request.blank('/v1.1/os-servers-create-ext')
+        req = webob.Request.blank('/v1.1/os-create-server-ext')
         req.headers['Content-Type'] = 'application/json'
         req.method = 'POST'
         req.body = json.dumps(body_dict)
@@ -334,7 +334,7 @@ class CreateserverextTest(test.TestCase):
         return ''.join(body_parts)
 
     def _get_create_request_xml(self, body_dict):
-        req = webob.Request.blank('/v1.1/os-servers-create-ext')
+        req = webob.Request.blank('/v1.1/os-create-server-ext')
         req.content_type = 'application/xml'
         req.accept = 'application/xml'
         req.method = 'POST'
-- 
cgit