deb-ryu/ryu/app/rest.py
Yoshihiro Kaneko b15a6649f3 app/rest: fix value error exception
This patch fixes value error exception.
The datapath-id is given in hex.

> Traceback (most recent call last):
>   File "/usr/lib/python2.7/dist-packages/gevent/pywsgi.py", line 438,
>   in handle_one_response
>     self.run_application()
>   File "/usr/lib/python2.7/dist-packages/gevent/pywsgi.py", line 424,
>   in run_application
>     self.result = self.application(self.environ, self.start_response)
>   File "/usr/local/lib/python2.7/dist-packages/webob/dec.py", line
>   130, in __call__
>     resp = self.call_func(req, *args, **self.kwargs)
>   File "/usr/local/lib/python2.7/dist-packages/webob/dec.py", line
>   195, in call_func
>     return self.func(req, *args, **kwargs)
>   File "/opt/stack/ryu/ryu/app/wsgi.py", line 81, in __call__
>     return controller(req)
>   File "/opt/stack/ryu/ryu/app/wsgi.py", line 52, in __call__
>     return getattr(self, action)(req, **kwargs)
>   File "/opt/stack/ryu/ryu/app/rest.py", line 104, in create
>     self.nw.create_port(network_id, int(dpid), int(port_id))
> ValueError: invalid literal for int() with base 10: '0000666a9c296241'

Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-07-06 16:38:31 +09:00

184 lines
6.0 KiB
Python

# Copyright (C) 2012 Nippon Telegraph and Telephone Corporation.
# Copyright (C) 2012 Isaku Yamahata <yamahata at private email ne jp>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import json
from webob import Request, Response
from ryu.base import app_manager
from ryu.controller import network
from ryu.exception import NetworkNotFound, NetworkAlreadyExist
from ryu.exception import PortNotFound, PortAlreadyExist
from ryu.app.wsgi import ControllerBase, WSGIApplication
## TODO:XXX
## define db interface and store those information into db
# REST API
# get the list of networks
# GET /v1.0/networks/
#
# register a new network.
# Fail if the network is already registered.
# POST /v1.0/networks/{network-id}
#
# update a new network.
# Success as nop even if the network is already registered.
#
# PUT /v1.0/networks/{network-id}
#
# remove a network
# DELETE /v1.0/networks/{network-id}
#
# get the list of sets of dpid and port
# GET /v1.0/networks/{network-id}/
#
# register a new set of dpid and port
# Fail if the port is already registered.
# POST /v1.0/networks/{network-id}/{dpid}_{port-id}
#
# update a new set of dpid and port
# Success as nop even if same port already registered
# PUT /v1.0/networks/{network-id}/{dpid}_{port-id}
#
# remove a set of dpid and port
# DELETE /v1.0/networks/{network-id}/{dpid}_{port-id}
# We store networks and ports like the following:
#
# {network_id: [(dpid, port), ...
# {3: [(3,4), (4,7)], 5: [(3,6)], 1: [(5,6), (4,5), (4, 10)]}
#
class NetworkController(ControllerBase):
def __init__(self, req, link, data, **config):
super(NetworkController, self).__init__(req, link, data, **config)
self.nw = data
def create(self, req, network_id, **_kwargs):
try:
self.nw.create_network(network_id)
except NetworkAlreadyExist:
return Response(status=409)
else:
return Response(status=200)
def update(self, req, network_id, **_kwargs):
self.nw.update_network(network_id)
return Response(status=200)
def lists(self, req, **_kwargs):
body = json.dumps(self.nw.list_networks())
return Response(content_type='application/json', body=body)
def delete(self, req, network_id, **_kwargs):
try:
self.nw.remove_network(network_id)
except NetworkNotFound:
return Response(status=404)
return Response(status=200)
class PortController(ControllerBase):
def __init__(self, req, link, data, **config):
super(PortController, self).__init__(req, link, data, **config)
self.nw = data
def create(self, req, network_id, dpid, port_id, **_kwargs):
try:
self.nw.create_port(network_id, int(dpid, 16), int(port_id))
except NetworkNotFound:
return Response(status=404)
except PortAlreadyExist:
return Response(status=409)
return Response(status=200)
def update(self, req, network_id, dpid, port_id, **_kwargs):
try:
self.nw.update_port(network_id, int(dpid, 16), int(port_id))
except NetworkNotFound:
return Response(status=404)
return Response(status=200)
def lists(self, req, network_id, **_kwargs):
try:
body = json.dumps(self.nw.list_ports(network_id))
except NetworkNotFound:
return Response(status=404)
return Response(content_type='application/json', body=body)
def delete(self, req, network_id, dpid, port_id, **_kwargs):
try:
self.nw.remove_port(network_id, int(dpid, 16), int(port_id))
except (NetworkNotFound, PortNotFound):
return Response(status=404)
return Response(status=200)
class restapi(app_manager.RyuApp):
_CONTEXTS = {
'network': network.Network,
'wsgi': WSGIApplication
}
def __init__(self, *args, **kwargs):
super(restapi, self).__init__(*args, **kwargs)
self.nw = kwargs['network']
wsgi = kwargs['wsgi']
mapper = wsgi.mapper
wsgi.registory['NetworkController'] = self.nw
uri = '/v1.0/networks'
mapper.connect('networks', uri,
controller=NetworkController, action='lists',
conditions=dict(method=['GET', 'HEAD']))
uri += '/{network_id}'
mapper.connect('networks', uri,
controller=NetworkController, action='create',
conditions=dict(method=['POST']))
mapper.connect('networks', uri,
controller=NetworkController, action='update',
conditions=dict(method=['PUT']))
mapper.connect('networks', uri,
controller=NetworkController, action='delete',
conditions=dict(method=['DELETE']))
wsgi.registory['PortController'] = self.nw
mapper.connect('networks', uri,
controller=PortController, action='lists',
conditions=dict(method=['GET']))
uri += '/{dpid}_{port_id}'
mapper.connect('ports', uri,
controller=PortController, action='create',
conditions=dict(method=['POST']))
mapper.connect('ports', uri,
controller=PortController, action='update',
conditions=dict(method=['PUT']))
mapper.connect('ports', uri,
controller=PortController, action='delete',
conditions=dict(method=['DELETE']))