@@ -400,10 +400,10 @@ main() {

     echo Description

     echo

     echo Copyright 2012, Cisco Systems

-    echo Copyright 2012, Nicira Networks, Inc.

+    echo Copyright 2012, VMware, Inc.

     echo Copyright 2012, NTT MCL, Inc.

     echo

-    echo Please direct any questions to dedutta@cisco.com, dan@nicira.com, nachi@nttmcl.com

+    echo Please direct any questions to dedutta@cisco.com, dwendlandt@vmware.com, nachi@nttmcl.com

     echo

deleted file mode 100644

@@ -1,149 +0,0 @@

-# Neutron Nicira NVP plugin

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

-

-# Save trace setting

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

-set +o xtrace

-

-source $TOP_DIR/lib/neutron_plugins/ovs_base

-

-function setup_integration_bridge() {

-    _neutron_ovs_base_setup_bridge $OVS_BRIDGE

-    # Set manager to NVP controller (1st of list)

-    if [[ "$NVP_CONTROLLERS" != "" ]]; then

-        # Get the first controller

-        controllers=(${NVP_CONTROLLERS//,/ })

-        OVS_MGR_IP=${controllers[0]}

-    else

-        die $LINENO "Error - No controller specified. Unable to set a manager for OVS"

-    fi

-    sudo ovs-vsctl set-manager ssl:$OVS_MGR_IP

-}

-

-function is_neutron_ovs_base_plugin() {

-    # NVP uses OVS, but not the l3-agent

-    return 0

-}

-

-function neutron_plugin_create_nova_conf() {

-    # if n-cpu is enabled, then setup integration bridge

-    if is_service_enabled n-cpu; then

-        setup_integration_bridge

-    fi

-}

-

-function neutron_plugin_install_agent_packages() {

-    # Nicira Plugin does not run q-agt, but it currently needs dhcp and metadata agents

-    _neutron_ovs_base_install_agent_packages

-}

-

-function neutron_plugin_configure_common() {

-    Q_PLUGIN_CONF_PATH=etc/neutron/plugins/nicira

-    Q_PLUGIN_CONF_FILENAME=nvp.ini

-    Q_DB_NAME="neutron_nvp"

-    Q_PLUGIN_CLASS="neutron.plugins.nicira.NeutronPlugin.NvpPluginV2"

-}

-

-function neutron_plugin_configure_debug_command() {

-    sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE

-    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge "$PUBLIC_BRIDGE"

-}

-

-function neutron_plugin_configure_dhcp_agent() {

-    setup_integration_bridge

-    iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True

-    iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True

-    iniset $Q_DHCP_CONF_FILE DEFAULT ovs_use_veth True

-}

-

-function neutron_plugin_configure_l3_agent() {

-    # Nicira plugin does not run L3 agent

-    die $LINENO "q-l3 should must not be executed with Nicira plugin!"

-}

-

-function neutron_plugin_configure_plugin_agent() {

-    # Nicira plugin does not run L2 agent

-    die $LINENO "q-agt must not be executed with Nicira plugin!"

-}

-

-function neutron_plugin_configure_service() {

-    if [[ "$MAX_LP_PER_BRIDGED_LS" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE nvp max_lp_per_bridged_ls $MAX_LP_PER_BRIDGED_LS

-    fi

-    if [[ "$MAX_LP_PER_OVERLAY_LS" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE nvp max_lp_per_overlay_ls $MAX_LP_PER_OVERLAY_LS

-    fi

-    if [[ "$FAILOVER_TIME" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE nvp failover_time $FAILOVER_TIME

-    fi

-    if [[ "$CONCURRENT_CONNECTIONS" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE nvp concurrent_connections $CONCURRENT_CONNECTIONS

-    fi

-

-    if [[ "$DEFAULT_TZ_UUID" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE DEFAULT default_tz_uuid $DEFAULT_TZ_UUID

-    else

-        die $LINENO "The nicira plugin won't work without a default transport zone."

-    fi

-    if [[ "$DEFAULT_L3_GW_SVC_UUID" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE DEFAULT default_l3_gw_service_uuid $DEFAULT_L3_GW_SVC_UUID

-        Q_L3_ENABLED=True

-        Q_L3_ROUTER_PER_TENANT=True

-        iniset /$Q_PLUGIN_CONF_FILE nvp metadata_mode access_network

-    fi

-    if [[ "$DEFAULT_L2_GW_SVC_UUID" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE DEFAULT default_l2_gw_service_uuid $DEFAULT_L2_GW_SVC_UUID

-    fi

-    # NVP_CONTROLLERS must be a comma separated string

-    if [[ "$NVP_CONTROLLERS" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE DEFAULT nvp_controllers $NVP_CONTROLLERS

-    else

-        die $LINENO "The nicira plugin needs at least an NVP controller."

-    fi

-    if [[ "$NVP_USER" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE DEFAULT nvp_user $NVP_USER

-    fi

-    if [[ "$NVP_PASSWORD" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE DEFAULT nvp_password $NVP_PASSWORD

-    fi

-    if [[ "$NVP_REQ_TIMEOUT" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE DEFAULT req_timeout $NVP_REQ_TIMEOUT

-    fi

-    if [[ "$NVP_HTTP_TIMEOUT" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE DEFAULT http_timeout $NVP_HTTP_TIMEOUT

-    fi

-    if [[ "$NVP_RETRIES" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE DEFAULT retries $NVP_RETRIES

-    fi

-    if [[ "$NVP_REDIRECTS" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE DEFAULT redirects $NVP_REDIRECTS

-    fi

-    if [[ "$AGENT_MODE" != "" ]]; then

-        iniset /$Q_PLUGIN_CONF_FILE nvp agent_mode $AGENT_MODE

-        if [[ "$AGENT_MODE" == "agentless" ]]; then

-            if [[ "$DEFAULT_SERVICE_CLUSTER_UUID" != "" ]]; then

-                iniset /$Q_PLUGIN_CONF_FILE DEFAULT default_service_cluster_uuid $DEFAULT_SERVICE_CLUSTER_UUID

-            else

-                die $LINENO "Agentless mode requires a service cluster."

-            fi

-            iniset /$Q_PLUGIN_CONF_FILE nvp_metadata metadata_server_address $Q_META_DATA_IP

-        fi

-    fi

-}

-

-function neutron_plugin_setup_interface_driver() {

-    local conf_file=$1

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

-}

-

-function has_neutron_plugin_security_group() {

-    # 0 means True here

-    return 0

-}

-

-function neutron_plugin_check_adv_test_requirements() {

-    is_service_enabled q-dhcp && return 0

-}

-

-# Restore xtrace

-$MY_XTRACE

new file mode 100644

@@ -0,0 +1,150 @@

+# Neutron VMware NSX plugin

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

+

+# Save trace setting

+MY_XTRACE=$(set +o | grep xtrace)

+set +o xtrace

+

+source $TOP_DIR/lib/neutron_plugins/ovs_base

+

+function setup_integration_bridge() {

+    _neutron_ovs_base_setup_bridge $OVS_BRIDGE

+    # Set manager to NSX controller (1st of list)

+    if [[ "$NSX_CONTROLLERS" != "" ]]; then

+        # Get the first controller

+        controllers=(${NSX_CONTROLLERS//,/ })

+        OVS_MGR_IP=${controllers[0]}

+    else

+        die $LINENO "Error - No controller specified. Unable to set a manager for OVS"

+    fi

+    sudo ovs-vsctl set-manager ssl:$OVS_MGR_IP

+}

+

+function is_neutron_ovs_base_plugin() {

+    # NSX uses OVS, but not the l3-agent

+    return 0

+}

+

+function neutron_plugin_create_nova_conf() {

+    # if n-cpu is enabled, then setup integration bridge

+    if is_service_enabled n-cpu; then

+        setup_integration_bridge

+    fi

+}

+

+function neutron_plugin_install_agent_packages() {

+    # VMware NSX Plugin does not run q-agt, but it currently needs dhcp and metadata agents

+    _neutron_ovs_base_install_agent_packages

+}

+

+function neutron_plugin_configure_common() {

+    Q_PLUGIN_CONF_PATH=etc/neutron/plugins/vmware

+    Q_PLUGIN_CONF_FILENAME=nsx.ini

+    Q_DB_NAME="neutron_nsx"

+    # TODO(armando-migliaccio): rename this once the code rename is complete

+    Q_PLUGIN_CLASS="neutron.plugins.nicira.NeutronPlugin.NvpPluginV2"

+}

+

+function neutron_plugin_configure_debug_command() {

+    sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE

+    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge "$PUBLIC_BRIDGE"

+}

+

+function neutron_plugin_configure_dhcp_agent() {

+    setup_integration_bridge

+    iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True

+    iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True

+    iniset $Q_DHCP_CONF_FILE DEFAULT ovs_use_veth True

+}

+

+function neutron_plugin_configure_l3_agent() {

+    # VMware NSX plugin does not run L3 agent

+    die $LINENO "q-l3 should must not be executed with VMware NSX plugin!"

+}

+

+function neutron_plugin_configure_plugin_agent() {

+    # VMware NSX plugin does not run L2 agent

+    die $LINENO "q-agt must not be executed with VMware NSX plugin!"

+}

+

+function neutron_plugin_configure_service() {

+    if [[ "$MAX_LP_PER_BRIDGED_LS" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE nsx max_lp_per_bridged_ls $MAX_LP_PER_BRIDGED_LS

+    fi

+    if [[ "$MAX_LP_PER_OVERLAY_LS" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE nsx max_lp_per_overlay_ls $MAX_LP_PER_OVERLAY_LS

+    fi

+    if [[ "$FAILOVER_TIME" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE nsx failover_time $FAILOVER_TIME

+    fi

+    if [[ "$CONCURRENT_CONNECTIONS" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE nsx concurrent_connections $CONCURRENT_CONNECTIONS

+    fi

+

+    if [[ "$DEFAULT_TZ_UUID" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE DEFAULT default_tz_uuid $DEFAULT_TZ_UUID

+    else

+        die $LINENO "The VMware NSX plugin won't work without a default transport zone."

+    fi

+    if [[ "$DEFAULT_L3_GW_SVC_UUID" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE DEFAULT default_l3_gw_service_uuid $DEFAULT_L3_GW_SVC_UUID

+        Q_L3_ENABLED=True

+        Q_L3_ROUTER_PER_TENANT=True

+        iniset /$Q_PLUGIN_CONF_FILE nsx metadata_mode access_network

+    fi

+    if [[ "$DEFAULT_L2_GW_SVC_UUID" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE DEFAULT default_l2_gw_service_uuid $DEFAULT_L2_GW_SVC_UUID

+    fi

+    # NSX_CONTROLLERS must be a comma separated string

+    if [[ "$NSX_CONTROLLERS" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_controllers $NSX_CONTROLLERS

+    else

+        die $LINENO "The VMware NSX plugin needs at least an NSX controller."

+    fi

+    if [[ "$NSX_USER" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_user $NSX_USER

+    fi

+    if [[ "$NSX_PASSWORD" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_password $NSX_PASSWORD

+    fi

+    if [[ "$NSX_REQ_TIMEOUT" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE DEFAULT req_timeout $NSX_REQ_TIMEOUT

+    fi

+    if [[ "$NSX_HTTP_TIMEOUT" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE DEFAULT http_timeout $NSX_HTTP_TIMEOUT

+    fi

+    if [[ "$NSX_RETRIES" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE DEFAULT retries $NSX_RETRIES

+    fi

+    if [[ "$NSX_REDIRECTS" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE DEFAULT redirects $NSX_REDIRECTS

+    fi

+    if [[ "$AGENT_MODE" != "" ]]; then

+        iniset /$Q_PLUGIN_CONF_FILE nsx agent_mode $AGENT_MODE

+        if [[ "$AGENT_MODE" == "agentless" ]]; then

+            if [[ "$DEFAULT_SERVICE_CLUSTER_UUID" != "" ]]; then

+                iniset /$Q_PLUGIN_CONF_FILE DEFAULT default_service_cluster_uuid $DEFAULT_SERVICE_CLUSTER_UUID

+            else

+                die $LINENO "Agentless mode requires a service cluster."

+            fi

+            iniset /$Q_PLUGIN_CONF_FILE nsx_metadata metadata_server_address $Q_META_DATA_IP

+        fi

+    fi

+}

+

+function neutron_plugin_setup_interface_driver() {

+    local conf_file=$1

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

+}

+

+function has_neutron_plugin_security_group() {

+    # 0 means True here

+    return 0

+}

+

+function neutron_plugin_check_adv_test_requirements() {

+    is_service_enabled q-dhcp && return 0

+}

+

+# Restore xtrace

+$MY_XTRACE

deleted file mode 100644

@@ -1,82 +0,0 @@

-# Nicira NVP

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

-

-# This third-party addition can be used to configure connectivity between a DevStack instance

-# and an NVP Gateway in dev/test environments. In order to use this correctly, the following

-# env variables need to be set (e.g. in your localrc file):

-#

-# * enable_service nicira            --> to execute this third-party addition

-# * PUBLIC_BRIDGE                    --> bridge used for external connectivity, typically br-ex

-# * NVP_GATEWAY_NETWORK_INTERFACE    --> interface used to communicate with the NVP Gateway

-# * NVP_GATEWAY_NETWORK_CIDR         --> CIDR to configure br-ex, e.g. 172.24.4.211/24

-

-# Save trace setting

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

-set +o xtrace

-

-# This is the interface that connects the Devstack instance

-# to an network that allows it to talk to the gateway for

-# testing purposes

-NVP_GATEWAY_NETWORK_INTERFACE=${NVP_GATEWAY_NETWORK_INTERFACE:-eth2}

-# Re-declare floating range as it's needed also in stop_nicira, which

-# is invoked by unstack.sh

-FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.0/24}

-

-function configure_nicira() {

-    :

-}

-

-function init_nicira() {

-    if ! is_set NVP_GATEWAY_NETWORK_CIDR; then

-        NVP_GATEWAY_NETWORK_CIDR=$PUBLIC_NETWORK_GATEWAY/${FLOATING_RANGE#*/}

-        echo "The IP address to set on br-ex was not specified. "

-        echo "Defaulting to "$NVP_GATEWAY_NETWORK_CIDR

-    fi

-    # Make sure the interface is up, but not configured

-    sudo ip link set $NVP_GATEWAY_NETWORK_INTERFACE up

-    # Save and then flush the IP addresses on the interface

-    addresses=$(ip addr show dev $NVP_GATEWAY_NETWORK_INTERFACE | grep inet | awk {'print $2'})

-    sudo ip addr flush $NVP_GATEWAY_NETWORK_INTERFACE

-    # Use the PUBLIC Bridge to route traffic to the NVP gateway

-    # NOTE(armando-migliaccio): if running in a nested environment this will work

-    # only with mac learning enabled, portsecurity and security profiles disabled

-    # The public bridge might not exist for the NVP plugin if Q_USE_DEBUG_COMMAND is off

-    # Try to create it anyway

-    sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE

-    sudo ovs-vsctl -- --may-exist add-port $PUBLIC_BRIDGE $NVP_GATEWAY_NETWORK_INTERFACE

-    nvp_gw_net_if_mac=$(ip link show $NVP_GATEWAY_NETWORK_INTERFACE | awk '/ether/ {print $2}')

-    sudo ip link set address $nvp_gw_net_if_mac dev $PUBLIC_BRIDGE

-    for address in $addresses; do

-        sudo ip addr add dev $PUBLIC_BRIDGE $address

-    done

-    sudo ip addr add dev $PUBLIC_BRIDGE $NVP_GATEWAY_NETWORK_CIDR

-}

-

-function install_nicira() {

-    :

-}

-

-function start_nicira() {

-    :

-}

-

-function stop_nicira() {

-    if ! is_set NVP_GATEWAY_NETWORK_CIDR; then

-        NVP_GATEWAY_NETWORK_CIDR=$PUBLIC_NETWORK_GATEWAY/${FLOATING_RANGE#*/}

-        echo "The IP address expected on br-ex was not specified. "

-        echo "Defaulting to "$NVP_GATEWAY_NETWORK_CIDR

-    fi

-    sudo ip addr del $NVP_GATEWAY_NETWORK_CIDR dev $PUBLIC_BRIDGE

-    # Save and then flush remaining addresses on the interface

-    addresses=$(ip addr show dev $PUBLIC_BRIDGE | grep inet | awk {'print $2'})

-    sudo ip addr flush $PUBLIC_BRIDGE

-    # Try to detach physical interface from PUBLIC_BRIDGE

-    sudo ovs-vsctl del-port $NVP_GATEWAY_NETWORK_INTERFACE

-    # Restore addresses on NVP_GATEWAY_NETWORK_INTERFACE

-    for address in $addresses; do

-        sudo ip addr add dev $NVP_GATEWAY_NETWORK_INTERFACE $address

-    done

-}

-

-# Restore xtrace

-$MY_XTRACE

new file mode 100644

@@ -0,0 +1,82 @@

+# VMware NSX

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

+

+# This third-party addition can be used to configure connectivity between a DevStack instance

+# and an NSX Gateway in dev/test environments. In order to use this correctly, the following

+# env variables need to be set (e.g. in your localrc file):

+#

+# * enable_service vmware_nsx        --> to execute this third-party addition

+# * PUBLIC_BRIDGE                    --> bridge used for external connectivity, typically br-ex

+# * NSX_GATEWAY_NETWORK_INTERFACE    --> interface used to communicate with the NSX Gateway

+# * NSX_GATEWAY_NETWORK_CIDR         --> CIDR to configure br-ex, e.g. 172.24.4.211/24

+

+# Save trace setting

+MY_XTRACE=$(set +o | grep xtrace)

+set +o xtrace

+

+# This is the interface that connects the Devstack instance

+# to an network that allows it to talk to the gateway for

+# testing purposes

+NSX_GATEWAY_NETWORK_INTERFACE=${NSX_GATEWAY_NETWORK_INTERFACE:-eth2}

+# Re-declare floating range as it's needed also in stop_vmware_nsx, which

+# is invoked by unstack.sh

+FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.0/24}

+

+function configure_vmware_nsx() {

+    :

+}

+

+function init_vmware_nsx() {

+    if ! is_set NSX_GATEWAY_NETWORK_CIDR; then

+        NSX_GATEWAY_NETWORK_CIDR=$PUBLIC_NETWORK_GATEWAY/${FLOATING_RANGE#*/}

+        echo "The IP address to set on br-ex was not specified. "

+        echo "Defaulting to "$NSX_GATEWAY_NETWORK_CIDR

+    fi

+    # Make sure the interface is up, but not configured

+    sudo ip link set $NSX_GATEWAY_NETWORK_INTERFACE up

+    # Save and then flush the IP addresses on the interface

+    addresses=$(ip addr show dev $NSX_GATEWAY_NETWORK_INTERFACE | grep inet | awk {'print $2'})

+    sudo ip addr flush $NSX_GATEWAY_NETWORK_INTERFACE

+    # Use the PUBLIC Bridge to route traffic to the NSX gateway

+    # NOTE(armando-migliaccio): if running in a nested environment this will work

+    # only with mac learning enabled, portsecurity and security profiles disabled

+    # The public bridge might not exist for the NSX plugin if Q_USE_DEBUG_COMMAND is off

+    # Try to create it anyway

+    sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE

+    sudo ovs-vsctl -- --may-exist add-port $PUBLIC_BRIDGE $NSX_GATEWAY_NETWORK_INTERFACE

+    nsx_gw_net_if_mac=$(ip link show $NSX_GATEWAY_NETWORK_INTERFACE | awk '/ether/ {print $2}')

+    sudo ip link set address $nsx_gw_net_if_mac dev $PUBLIC_BRIDGE

+    for address in $addresses; do

+        sudo ip addr add dev $PUBLIC_BRIDGE $address

+    done

+    sudo ip addr add dev $PUBLIC_BRIDGE $NSX_GATEWAY_NETWORK_CIDR

+}

+

+function install_vmware_nsx() {

+    :

+}

+

+function start_vmware_nsx() {

+    :

+}

+

+function stop_vmware_nsx() {

+    if ! is_set NSX_GATEWAY_NETWORK_CIDR; then

+        NSX_GATEWAY_NETWORK_CIDR=$PUBLIC_NETWORK_GATEWAY/${FLOATING_RANGE#*/}

+        echo "The IP address expected on br-ex was not specified. "

+        echo "Defaulting to "$NSX_GATEWAY_NETWORK_CIDR

+    fi

+    sudo ip addr del $NSX_GATEWAY_NETWORK_CIDR dev $PUBLIC_BRIDGE

+    # Save and then flush remaining addresses on the interface

+    addresses=$(ip addr show dev $PUBLIC_BRIDGE | grep inet | awk {'print $2'})

+    sudo ip addr flush $PUBLIC_BRIDGE

+    # Try to detach physical interface from PUBLIC_BRIDGE

+    sudo ovs-vsctl del-port $NSX_GATEWAY_NETWORK_INTERFACE

+    # Restore addresses on NSX_GATEWAY_NETWORK_INTERFACE

+    for address in $addresses; do

+        sudo ip addr add dev $NSX_GATEWAY_NETWORK_INTERFACE $address

+    done

+}

+

+# Restore xtrace

+$MY_XTRACE