From 2743eb4da5c7e1cfca5e0f4f6521d39281d6cca5 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Date: Mon, 17 Feb 2014 12:49:08 +0900
Subject: [PATCH] rename neutron agent from "ofswitch" to "ofagent"

suggested by some openstack folks.
see https://review.openstack.org/#/c/71791

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
 ...n-ofswitch-agent => neutron-ofagent-agent} |  2 +-
 doc/source/conf.py                            |  4 ++--
 doc/source/man/neutron_ofagent_agent.rst      | 20 +++++++++++++++++++
 doc/source/man/neutron_ofswitch_agent.rst     | 20 -------------------
 run_tests.sh                                  |  2 +-
 ..._neutron_agent.py => ofa_neutron_agent.py} |  6 +++---
 setup.cfg                                     |  2 +-
 7 files changed, 28 insertions(+), 28 deletions(-)
 rename bin/{neutron-ofswitch-agent => neutron-ofagent-agent} (93%)
 create mode 100644 doc/source/man/neutron_ofagent_agent.rst
 delete mode 100644 doc/source/man/neutron_ofswitch_agent.rst
 rename ryu/cmd/{ofs_neutron_agent.py => ofa_neutron_agent.py} (92%)

diff --git a/bin/neutron-ofswitch-agent b/bin/neutron-ofagent-agent
similarity index 93%
rename from bin/neutron-ofswitch-agent
rename to bin/neutron-ofagent-agent
index 2778b220..badf2ea0 100755
--- a/bin/neutron-ofswitch-agent
+++ b/bin/neutron-ofagent-agent
@@ -15,5 +15,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ryu.cmd.ofs_neutron_agent import main
+from ryu.cmd.ofa_neutron_agent import main
 main()
diff --git a/doc/source/conf.py b/doc/source/conf.py
index afa836c3..fcec4c62 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -215,8 +215,8 @@ latex_documents = [
 man_pages = [
     ('index', 'ryu', u'ryu Documentation',
      [u'ryu development team'], 1),
-    ('man/neutron_ofswitch_agent', 'neutron-ofswitch-agent',
-     u'neutron ofswitch agent',
+    ('man/neutron_ofagent_agent', 'neutron-ofagent-agent',
+     u'neutron ofagent agent',
      [u'ryu development team'], 1),
     ('man/rpc_cli', 'rpc-cli', u'a simple msgpack-rpc client',
      [u'ryu development team'], 1),
diff --git a/doc/source/man/neutron_ofagent_agent.rst b/doc/source/man/neutron_ofagent_agent.rst
new file mode 100644
index 00000000..2b95bc12
--- /dev/null
+++ b/doc/source/man/neutron_ofagent_agent.rst
@@ -0,0 +1,20 @@
+:orphan:
+
+neutron-ofagent-agent manual page
+=================================
+
+Synoposis
+---------
+**neutron-ofagent-agent** [*options*]
+
+Description
+-----------
+:program:`neutron-ofagent-agent` is a neutron agent for ofagent ML2 driver.
+
+Options
+-------
+-h, --help
+
+Author
+------
+Ryu development team
diff --git a/doc/source/man/neutron_ofswitch_agent.rst b/doc/source/man/neutron_ofswitch_agent.rst
deleted file mode 100644
index d2477451..00000000
--- a/doc/source/man/neutron_ofswitch_agent.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-:orphan:
-
-neutron-ofswitch-agent manual page
-==================================
-
-Synoposis
----------
-**neutron-ofswitch-agent** [*options*]
-
-Description
------------
-:program:`neutron-ofswitch-agent` is a neutron agent for ofswitch ML2 driver.
-
-Options
--------
--h, --help
-
-Author
-------
-Ryu development team
diff --git a/run_tests.sh b/run_tests.sh
index a6fbbef0..e47b4c33 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -90,7 +90,7 @@ run_tests() {
 run_pylint() {
   echo "Running pylint ..."
   PYLINT_OPTIONS="--rcfile=.pylintrc --output-format=parseable"
-  PYLINT_INCLUDE="ryu bin/rpc-cli bin/neutron-ofswitch-agent ryu/tests/bin/ryu-client ryu/tests/bin/of-config-cli"
+  PYLINT_INCLUDE="ryu bin/rpc-cli bin/neutron-ofagent-agent ryu/tests/bin/ryu-client ryu/tests/bin/of-config-cli"
   export PYTHONPATH=$PYTHONPATH:.ryu
   PYLINT_LOG=pylint.log
 
diff --git a/ryu/cmd/ofs_neutron_agent.py b/ryu/cmd/ofa_neutron_agent.py
similarity index 92%
rename from ryu/cmd/ofs_neutron_agent.py
rename to ryu/cmd/ofa_neutron_agent.py
index b38fefed..42656b30 100755
--- a/ryu/cmd/ofs_neutron_agent.py
+++ b/ryu/cmd/ofa_neutron_agent.py
@@ -55,17 +55,17 @@ CONF.register_cli_opts([
 
 def main():
     try:
-        CONF(project='ryu', version='ofs_neutron_agent %s' % version,
+        CONF(project='ryu', version='ofa_neutron_agent %s' % version,
              default_config_files=['/usr/local/etc/ryu/ryu.conf'])
     except cfg.ConfigFilesNotFoundError:
-        CONF(project='ryu', version='ofs_neutron_agent %s' % version)
+        CONF(project='ryu', version='ofa_neutron_agent %s' % version)
 
     osn_config.setup_logging(CONF)
 
     app_lists = CONF.app_lists + CONF.app
     if not app_lists:
         app_lists = ['ryu.app.ofctl.service',
-                     'neutron.plugins.ofswitch.agent.ofs_neutron_agent']
+                     'neutron.plugins.ofagent.agent.ofa_neutron_agent']
 
     app_mgr = AppManager.get_instance()
     app_mgr.load_apps(app_lists)
diff --git a/setup.cfg b/setup.cfg
index 1075ef42..b0a0d17c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -47,6 +47,6 @@ setup-hooks =
 
 [entry_points]
 console_scripts =
-    neutron-ofswitch-agent = ryu.cmd.ofs_neutron_agent:main
+    neutron-ofagent-agent = ryu.cmd.ofa_neutron_agent:main
     ryu-manager = ryu.cmd.manager:main
     rpc-cli = ryu.cmd.rpc_cli:main