On Thu, 24 Sep 2015 11:10:04 +0900 Takashi Yamamoto <[email protected]> wrote:
> iirc rest_qos is not usable without rest_conf_switch. Thanks, looks like so. Here's v2. = >From 629c926d6d410b6480d47800b5a0a247f64c4d53 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori <[email protected]> Date: Sun, 27 Sep 2015 09:00:34 +0900 Subject: [PATCH v2] remove old Ryu OpenStack plugin stuff The plugin that uses these was removed from OpenStack long ago. Signed-off-by: FUJITA Tomonori <[email protected]> --- doc/source/components.rst | 36 -- ryu/app/client.py | 286 ------------ ryu/app/gre_tunnel.py | 980 ----------------------------------------- ryu/app/quantum_adapter.py | 446 ------------------- ryu/app/rest.py | 270 ------------ ryu/app/rest_nw_id.py | 41 -- ryu/app/rest_quantum.py | 136 ------ ryu/app/rest_tunnel.py | 218 --------- ryu/app/simple_isolation.py | 351 --------------- ryu/app/simple_vlan.py | 229 ---------- ryu/app/tunnel_port_updater.py | 473 -------------------- ryu/flags.py | 30 -- ryu/lib/quantum_ifaces.py | 131 ------ 13 files changed, 3627 deletions(-) delete mode 100644 ryu/app/client.py delete mode 100644 ryu/app/gre_tunnel.py delete mode 100644 ryu/app/quantum_adapter.py delete mode 100644 ryu/app/rest.py delete mode 100644 ryu/app/rest_nw_id.py delete mode 100644 ryu/app/rest_quantum.py delete mode 100644 ryu/app/rest_tunnel.py delete mode 100644 ryu/app/simple_isolation.py delete mode 100644 ryu/app/simple_vlan.py delete mode 100644 ryu/app/tunnel_port_updater.py delete mode 100644 ryu/lib/quantum_ifaces.py diff --git a/doc/source/components.rst b/doc/source/components.rst index 3a5876c..d2dbb7b 100644 --- a/doc/source/components.rst +++ b/doc/source/components.rst @@ -94,42 +94,6 @@ ryu.app.simple_switch --------------------- .. automodule:: ryu.app.simple_switch -ryu.app.simple_isolation ------------------------- -.. automodule:: ryu.app.simple_isolation - -ryu.app.simple_vlan -------------------- -.. automodule:: ryu.app.simple_vlan - -ryu.app.gre_tunnel ------------------- -.. automodule:: ryu.app.gre_tunnel - -ryu.app.tunnel_port_updater ---------------------------- -.. automodule:: ryu.app.tunnel_port_updater - -ryu.app.quantum_adapter ------------------------ -.. automodule:: ryu.app.quantum_adapter - -ryu.app.rest ------------- -.. automodule:: ryu.app.rest - -ryu.app.rest_conf_switch ------------------------- -.. automodule:: ryu.app.rest_conf_switch - -ryu.app.rest_quantum --------------------- -.. automodule:: ryu.app.rest_quantum - -ryu.app.rest_tunnel -------------------- -.. automodule:: ryu.app.rest_tunnel - ryu.topology ------------ .. automodule:: ryu.topology diff --git a/ryu/app/client.py b/ryu/app/client.py deleted file mode 100644 index 98752ce..0000000 diff --git a/ryu/app/gre_tunnel.py b/ryu/app/gre_tunnel.py deleted file mode 100644 index aae910a..0000000 diff --git a/ryu/app/quantum_adapter.py b/ryu/app/quantum_adapter.py deleted file mode 100644 index 67aa652..0000000 diff --git a/ryu/app/rest.py b/ryu/app/rest.py deleted file mode 100644 index fdd19ca..0000000 diff --git a/ryu/app/rest_nw_id.py b/ryu/app/rest_nw_id.py deleted file mode 100644 index c31fd7b..0000000 diff --git a/ryu/app/rest_quantum.py b/ryu/app/rest_quantum.py deleted file mode 100644 index 5bf1480..0000000 diff --git a/ryu/app/rest_tunnel.py b/ryu/app/rest_tunnel.py deleted file mode 100644 index 74f5e46..0000000 diff --git a/ryu/app/simple_isolation.py b/ryu/app/simple_isolation.py deleted file mode 100644 index 40c490e..0000000 diff --git a/ryu/app/simple_vlan.py b/ryu/app/simple_vlan.py deleted file mode 100644 index ea0e76f..0000000 diff --git a/ryu/app/tunnel_port_updater.py b/ryu/app/tunnel_port_updater.py deleted file mode 100644 index 6e25c8f..0000000 diff --git a/ryu/flags.py b/ryu/flags.py index 225cbbb..a6e5c98 100644 --- a/ryu/flags.py +++ b/ryu/flags.py @@ -22,36 +22,6 @@ from ryu import cfg CONF = cfg.CONF CONF.register_cli_opts([ - # app/quantum_adapter - cfg.StrOpt('neutron-url', default='http://localhost:9696', - help='URL for connecting to neutron', - deprecated_name='quantum-url'), - cfg.IntOpt('neutron-url-timeout', default=30, - help='timeout value for connecting to neutron in seconds', - deprecated_name='quantum-url-timeout'), - cfg.StrOpt('neutron-admin-username', default='neutron', - help='username for connecting to neutron in admin context', - deprecated_name='quantum-admin-username'), - cfg.StrOpt('neutron-admin-password', default='service_password', - help='password for connecting to neutron in admin context', - deprecated_name='quantum-admin-password'), - cfg.StrOpt('neutron-admin-tenant-name', default='service', - help='tenant name for connecting to neutron in admin context', - deprecated_name='quantum-admin-tenant-name'), - cfg.StrOpt('neutron-admin-auth-url', default='http://localhost:5000/v2.0', - help='auth url for connecting to neutron in admin context', - deprecated_name='quantum-admin-auth-url'), - cfg.StrOpt('neutron-auth-strategy', default='keystone', - help='auth strategy for connecting to neutron in admin' - 'context', - deprecated_name='quantum-auth-strategy'), - cfg.StrOpt('neutron-controller-addr', default=None, - help='openflow method:address:port to set controller of' - 'ovs bridge', - deprecated_name='quantum-controller-addr') -]) - -CONF.register_cli_opts([ # tests/switch/tester cfg.StrOpt('target', default='0000000000000001', help='target sw dp-id'), cfg.StrOpt('tester', default='0000000000000002', help='tester sw dp-id'), diff --git a/ryu/lib/quantum_ifaces.py b/ryu/lib/quantum_ifaces.py deleted file mode 100644 index 2dfd8f0..0000000 -- 1.9.1 ------------------------------------------------------------------------------ _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
