x/quark
Code Issues Proposed changes

Openstack Quantum renamed to Neutron

Browse Source
This commit is contained in:
Amir Sadoughi
2013-07-04 13:31:40 -05:00
parent 9d9b515279
commit 3eec6db02c
23 changed files with 186 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
quark/api/auth.py
View File

@@ -16,9 +16,9 @@
import webob.dec
import webob.exc
from quantum import context
from quantum.openstack.common import log as logging
from quantum import wsgi
from neutron import context
from neutron.openstack.common import log as logging
from neutron import wsgi
LOG = logging.getLogger(__name__)
@@ -44,5 +44,5 @@ class NoAuthMiddleware(wsgi.Middleware):
project_id,
is_admin=True)
req.environ['quantum.context'] = ctx
req.environ['neutron.context'] = ctx
return self.application

14
quark/api/extensions/ip_addresses.py
View File

@@ -15,11 +15,11 @@
import webob
from quantum.api import extensions
from quantum.common import exceptions
from quantum import manager
from quantum.openstack.common import log as logging
from quantum import wsgi
from neutron.api import extensions
from neutron.common import exceptions
from neutron import manager
from neutron.openstack.common import log as logging
from neutron import wsgi
RESOURCE_NAME = 'ip_address'
RESOURCE_COLLECTION = RESOURCE_NAME + "es"
@@ -32,7 +32,7 @@ attr_dict[RESOURCE_NAME] = {'allow_post': True,
'allow_put': True,
'is_visible': True}
LOG = logging.getLogger("quantum.quark.api.extensions.ip_addresses")
LOG = logging.getLogger("neutron.quark.api.extensions.ip_addresses")
class IpAddressesController(wsgi.Controller):
@@ -105,7 +105,7 @@ class Ip_addresses(object):
@classmethod
def get_resources(cls):
"""Returns Ext Resources."""
controller = IpAddressesController(manager.QuantumManager.get_plugin())
controller = IpAddressesController(manager.NeutronManager.get_plugin())
return [extensions.ResourceExtension(
Ip_addresses.get_alias(),
controller)]

12
quark/api/extensions/mac_address_ranges.py
View File

@@ -15,10 +15,10 @@
import webob
from quantum.api import extensions
from quantum import manager
from quantum.openstack.common import log as logging
from quantum import wsgi
from neutron.api import extensions
from neutron import manager
from neutron.openstack.common import log as logging
from neutron import wsgi
RESOURCE_NAME = 'mac_address_range'
RESOURCE_COLLECTION = RESOURCE_NAME + "s"
@@ -31,7 +31,7 @@ attr_dict[RESOURCE_NAME] = {'allow_post': True,
'allow_put': False,
'is_visible': True}
LOG = logging.getLogger("quantum.quark.api.extensions.mac_address_ranges")
LOG = logging.getLogger("neutron.quark.api.extensions.mac_address_ranges")
def mac_range_dict(mac_range):
@@ -102,7 +102,7 @@ class Mac_address_ranges(object):
@classmethod
def get_resources(cls):
"""Returns Ext Resources."""
plugin = manager.QuantumManager.get_plugin()
plugin = manager.NeutronManager.get_plugin()
controller = MacAddressRangesController(plugin)
return [extensions.ResourceExtension(Mac_address_ranges.get_alias(),
controller)]

18
quark/api/extensions/ports_quark.py
View File

@@ -15,13 +15,13 @@
import webob
from quantum.api import extensions
from quantum.api.v2 import attributes
from quantum.api.v2 import base
from quantum.api.v2 import resource
from quantum.common import exceptions
from quantum import manager
from quantum import wsgi
from neutron.api import extensions
from neutron.api.v2 import attributes
from neutron.api.v2 import base
from neutron.api.v2 import resource
from neutron.common import exceptions
from neutron import manager
from neutron import wsgi
RESOURCE_NAME = "port"
RESOURCE_COLLECTION = RESOURCE_NAME + "s"
@@ -117,7 +117,7 @@ class Ports_quark(object):
collection_name=RESOURCE_COLLECTION)
quark_ports_ip_address_controller = resource.Resource(
QuarkPortsIPAddressController(
manager.QuantumManager.get_plugin()),
manager.NeutronManager.get_plugin()),
base.FAULT_MAP)
extension = extensions.ResourceExtension(
"ip_address",
@@ -131,7 +131,7 @@ class Ports_quark(object):
exts = []
quark_ports_update_handler = QuarkPortsUpdateHandler(
manager.QuantumManager.get_plugin())
manager.NeutronManager.get_plugin())
extension = extensions.RequestExtension(
"POST", "/ports/:(id)",
quark_ports_update_handler.handle)

14
quark/api/extensions/routes.py
View File

@@ -15,11 +15,11 @@
import webob
from quantum.api import extensions
from quantum.common import exceptions
from quantum import manager
from quantum.openstack.common import log as logging
from quantum import wsgi
from neutron.api import extensions
from neutron.common import exceptions
from neutron import manager
from neutron.openstack.common import log as logging
from neutron import wsgi
RESOURCE_NAME = 'route'
RESOURCE_COLLECTION = RESOURCE_NAME + "s"
@@ -32,7 +32,7 @@ attr_dict[RESOURCE_NAME] = {'allow_post': True,
'allow_put': True,
'is_visible': True}
LOG = logging.getLogger("quantum.quark.api.extensions.routes")
LOG = logging.getLogger("neutron.quark.api.extensions.routes")
def route_dict(route):
@@ -109,7 +109,7 @@ class Routes(object):
@classmethod
def get_resources(cls):
"""Returns Ext Resources."""
controller = RoutesController(manager.QuantumManager.get_plugin())
controller = RoutesController(manager.NeutronManager.get_plugin())
return [extensions.ResourceExtension(
Routes.get_alias(),
controller)]

4
quark/api/extensions/subnets_quark.py
View File

@@ -15,8 +15,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from quantum.api import extensions
from quantum.api.v2 import attributes
from neutron.api import extensions
from neutron.api.v2 import attributes
EXTENDED_ATTRIBUTES_2_0 = {
'subnets': {