@@ -56,12 +56,6 @@ OpenFlow Agent (ofagent)

 * YAMAMOTO Takashi <yamamoto@valinux.co.jp>

 * Fumihiko Kakuma <kakuma@valinux.co.jp>

-Ryu

-~~~

-

-* YAMAMOTO Takashi <yamamoto@valinux.co.jp>

-* Fumihiko Kakuma <kakuma@valinux.co.jp>

-

 Sahara

 ~~~~~~

@@ -18,7 +18,6 @@ function neutron_plugin_install_agent_packages {

     # This agent uses ryu to talk with switches

     install_package $(get_packages "ryu")

     install_ryu

-    configure_ryu

 }

 function neutron_plugin_configure_debug_command {

deleted file mode 100644

@@ -1,79 +0,0 @@

-# Neutron Ryu plugin

-# ------------------

-

-# Save trace setting

-RYU_XTRACE=$(set +o | grep xtrace)

-set +o xtrace

-

-source $TOP_DIR/lib/neutron_plugins/ovs_base

-source $TOP_DIR/lib/neutron_thirdparty/ryu      # for configuration value

-

-function neutron_plugin_create_nova_conf {

-    _neutron_ovs_base_configure_nova_vif_driver

-    iniset $NOVA_CONF DEFAULT libvirt_ovs_integration_bridge "$OVS_BRIDGE"

-}

-

-function neutron_plugin_install_agent_packages {

-    _neutron_ovs_base_install_agent_packages

-

-    # neutron_ryu_agent requires ryu module

-    install_package $(get_packages "ryu")

-    install_ryu

-    configure_ryu

-}

-

-function neutron_plugin_configure_common {

-    Q_PLUGIN_CONF_PATH=etc/neutron/plugins/ryu

-    Q_PLUGIN_CONF_FILENAME=ryu.ini

-    Q_PLUGIN_CLASS="neutron.plugins.ryu.ryu_neutron_plugin.RyuNeutronPluginV2"

-}

-

-function neutron_plugin_configure_debug_command {

-    _neutron_ovs_base_configure_debug_command

-    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT ryu_api_host $RYU_API_HOST:$RYU_API_PORT

-}

-

-function neutron_plugin_configure_dhcp_agent {

-    iniset $Q_DHCP_CONF_FILE DEFAULT ryu_api_host $RYU_API_HOST:$RYU_API_PORT

-}

-

-function neutron_plugin_configure_l3_agent {

-    iniset $Q_L3_CONF_FILE DEFAULT ryu_api_host $RYU_API_HOST:$RYU_API_PORT

-    _neutron_ovs_base_configure_l3_agent

-}

-

-function neutron_plugin_configure_plugin_agent {

-    # Set up integration bridge

-    _neutron_ovs_base_setup_bridge $OVS_BRIDGE

-    if [ -n "$RYU_INTERNAL_INTERFACE" ]; then

-        sudo ovs-vsctl --no-wait -- --may-exist add-port $OVS_BRIDGE $RYU_INTERNAL_INTERFACE

-    fi

-    iniset /$Q_PLUGIN_CONF_FILE ovs integration_bridge $OVS_BRIDGE

-    AGENT_BINARY="$NEUTRON_DIR/neutron/plugins/ryu/agent/ryu_neutron_agent.py"

-

-    _neutron_ovs_base_configure_firewall_driver

-}

-

-function neutron_plugin_configure_service {

-    iniset /$Q_PLUGIN_CONF_FILE ovs openflow_rest_api $RYU_API_HOST:$RYU_API_PORT

-

-    _neutron_ovs_base_configure_firewall_driver

-}

-

-function neutron_plugin_setup_interface_driver {

-    local conf_file=$1

-    iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver

-    iniset $conf_file DEFAULT ovs_use_veth True

-}

-

-function has_neutron_plugin_security_group {

-    # 0 means True here

-    return 0

-}

-

-function neutron_plugin_check_adv_test_requirements {

-    is_service_enabled q-agt && is_service_enabled q-dhcp && return 0

-}

-

-# Restore xtrace

-$RYU_XTRACE

@@ -1,56 +1,15 @@

-# Ryu OpenFlow Controller

-# -----------------------

+# Ryu SDN Framework

+# -----------------

+

+# Used by ofagent.

+# TODO(yamamoto): Switch to pip_install once the development was settled

 # Save trace setting

 RYU3_XTRACE=$(set +o | grep xtrace)

 set +o xtrace

-

 RYU_DIR=$DEST/ryu

-# Ryu API Host

-RYU_API_HOST=${RYU_API_HOST:-127.0.0.1}

-# Ryu API Port

-RYU_API_PORT=${RYU_API_PORT:-8080}

-# Ryu OFP Host

-RYU_OFP_HOST=${RYU_OFP_HOST:-127.0.0.1}

-# Ryu OFP Port

-RYU_OFP_PORT=${RYU_OFP_PORT:-6633}

-# Ryu Applications

-RYU_APPS=${RYU_APPS:-ryu.app.simple_isolation,ryu.app.rest}

-

-function configure_ryu {

-    :

-}

-

-function init_ryu {

-    RYU_CONF_DIR=/etc/ryu

-    if [[ ! -d $RYU_CONF_DIR ]]; then

-        sudo mkdir -p $RYU_CONF_DIR

-    fi

-    sudo chown $STACK_USER $RYU_CONF_DIR

-    RYU_CONF=$RYU_CONF_DIR/ryu.conf

-    sudo rm -rf $RYU_CONF

-

-    # Ryu configuration

-    RYU_CONF_CONTENTS=${RYU_CONF_CONTENTS:-"[DEFAULT]

-app_lists=$RYU_APPS

-wsapi_host=$RYU_API_HOST

-wsapi_port=$RYU_API_PORT

-ofp_listen_host=$RYU_OFP_HOST

-ofp_tcp_listen_port=$RYU_OFP_PORT

-neutron_url=http://$Q_HOST:$Q_PORT

-neutron_admin_username=$Q_ADMIN_USERNAME

-neutron_admin_password=$SERVICE_PASSWORD

-neutron_admin_tenant_name=$SERVICE_TENANT_NAME

-neutron_admin_auth_url=$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v2.0

-neutron_auth_strategy=$Q_AUTH_STRATEGY

-neutron_controller_addr=tcp:$RYU_OFP_HOST:$RYU_OFP_PORT

-"}

-    echo "${RYU_CONF_CONTENTS}" > $RYU_CONF

-}

-# install_ryu can be called multiple times as neutron_pluing/ryu may call

-# this function for neutron-ryu-agent

 # Make this function idempotent and avoid cloning same repo many times

 # with RECLONE=yes

 _RYU_INSTALLED=${_RYU_INSTALLED:-False}

@@ -63,17 +22,5 @@ function install_ryu {

     fi

 }

-function start_ryu {

-    run_process ryu "$RYU_DIR/bin/ryu-manager --config-file $RYU_CONF"

-}

-

-function stop_ryu {

-    :

-}

-

-function check_ryu {

-    :

-}

-

 # Restore xtrace

 $RYU3_XTRACE