@@ -66,21 +66,21 @@ Run stack.sh and do some sanity checks

     ./stack.sh

     . ./openrc

-    neutron net-list  # should show public and private networks

+    openstack network list  # should show public and private networks

 Create two nova instances that we can use as test http servers:

   ::

     #create nova instances on private network

-    nova boot --image $(nova image-list | awk '/ cirros-.*-x86_64-uec / {print $2}') --flavor 1 --nic net-id=$(neutron net-list | awk '/ private / {print $2}') node1

-    nova boot --image $(nova image-list | awk '/ cirros-.*-x86_64-uec / {print $2}') --flavor 1 --nic net-id=$(neutron net-list | awk '/ private / {print $2}') node2

+    nova boot --image $(nova image-list | awk '/ cirros-.*-x86_64-uec / {print $2}') --flavor 1 --nic net-id=$(openstack network list | awk '/ private / {print $2}') node1

+    nova boot --image $(nova image-list | awk '/ cirros-.*-x86_64-uec / {print $2}') --flavor 1 --nic net-id=$(openstack network list | awk '/ private / {print $2}') node2

     nova list # should show the nova instances just created

     #add secgroup rules to allow ssh etc..

-    neutron security-group-rule-create default --protocol icmp

-    neutron security-group-rule-create default --protocol tcp --port-range-min 22 --port-range-max 22

-    neutron security-group-rule-create default --protocol tcp --port-range-min 80 --port-range-max 80

+    openstack security group rule create default --protocol icmp

+    openstack security group rule create default --protocol tcp --dst-port 22:22

+    openstack security group rule create default --protocol tcp --dst-port 80:80

 Set up a simple web server on each of these instances. ssh into each instance (username 'cirros', password 'cubswin:)') and run

@@ -156,7 +156,7 @@ function get_role_id {

 function get_network_id {

     local NETWORK_NAME="$1"

     local NETWORK_ID

-    NETWORK_ID=`neutron net-list -F id  -- --name=$NETWORK_NAME | awk "NR==4" | awk '{print $2}'`

+    NETWORK_ID=`openstack network list | grep $NETWORK_NAME | awk '{print $2}'`

     echo $NETWORK_ID

 }

@@ -234,9 +234,9 @@ function create_network {

     PROJECT_ID=$(get_project_id $PROJECT)

     source $TOP_DIR/openrc $PROJECT $PROJECT

     local NET_ID

-    NET_ID=$(neutron net-create --project-id $PROJECT_ID $NET_NAME $EXTRA| grep ' id ' | awk '{print $4}' )

+    NET_ID=$(openstack network create --project $PROJECT_ID $NET_NAME $EXTRA| grep ' id ' | awk '{print $4}' )

     die_if_not_set $LINENO NET_ID "Failure creating NET_ID for $PROJECT_ID $NET_NAME $EXTRA"

-    neutron subnet-create --ip-version 4 --project-id $PROJECT_ID --gateway $GATEWAY --subnetpool None $NET_ID $CIDR

+    openstack subnet create --ip-version 4 --project $PROJECT_ID --gateway $GATEWAY --subnet-pool None --network $NET_ID --subnet-range $CIDR "${NET_NAME}_subnet"

     neutron_debug_admin probe-create --device-owner compute $NET_ID

     source $TOP_DIR/openrc demo demo

 }

@@ -325,10 +325,10 @@ function delete_network {

     PROJECT_ID=$(get_project_id $PROJECT)

     #TODO(nati) comment out until l3-agent merged

     #for res in port subnet net router;do

-    for net_id in `neutron net-list -c id -c name | grep $NET_NAME | awk '{print $2}'`;do

+    for net_id in `openstack network list -c ID -c Name | grep $NET_NAME | awk '{print $2}'`;do

         delete_probe $net_id

-        neutron subnet-list | grep $net_id | awk '{print $2}' | xargs -I% neutron subnet-delete %

-        neutron net-delete $net_id

+        openstack subnet list | grep $net_id | awk '{print $2}' | xargs -I% openstack subnet delete %

+        openstack network delete $net_id

     done

     source $TOP_DIR/openrc demo demo

 }

@@ -174,10 +174,10 @@ function create_neutron_initial_network {

     if is_networking_extension_supported "auto-allocated-topology"; then

         if [[ "$USE_SUBNETPOOL" == "True" ]]; then

             if [[ "$IP_VERSION" =~ 4.* ]]; then

-                SUBNETPOOL_V4_ID=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" subnetpool-create $SUBNETPOOL_NAME --default-prefixlen $SUBNETPOOL_SIZE_V4 --pool-prefix $SUBNETPOOL_PREFIX_V4 --shared --is-default=True | grep ' id ' | get_field 2)

+                SUBNETPOOL_V4_ID=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" subnet pool create $SUBNETPOOL_NAME --default-prefix-length $SUBNETPOOL_SIZE_V4 --pool-prefix $SUBNETPOOL_PREFIX_V4 --share --default | grep ' id ' | get_field 2)

             fi

             if [[ "$IP_VERSION" =~ .*6 ]]; then

-                SUBNETPOOL_V6_ID=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" subnetpool-create $SUBNETPOOL_NAME --default-prefixlen $SUBNETPOOL_SIZE_V6 --pool-prefix $SUBNETPOOL_PREFIX_V6 --shared --is-default=True | grep ' id ' | get_field 2)

+                SUBNETPOOL_V6_ID=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" subnet pool create $SUBNETPOOL_NAME --default-prefix-length $SUBNETPOOL_SIZE_V6 --pool-prefix $SUBNETPOOL_PREFIX_V6 --share --default | grep ' id ' | get_field 2)

             fi

         fi

     fi

@@ -185,14 +185,14 @@ function create_neutron_initial_network {

     if is_provider_network; then

         die_if_not_set $LINENO PHYSICAL_NETWORK "You must specify the PHYSICAL_NETWORK"

         die_if_not_set $LINENO PROVIDER_NETWORK_TYPE "You must specify the PROVIDER_NETWORK_TYPE"

-        NET_ID=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" net-create $PHYSICAL_NETWORK --tenant_id $project_id --provider:network_type $PROVIDER_NETWORK_TYPE --provider:physical_network "$PHYSICAL_NETWORK" ${SEGMENTATION_ID:+--provider:segmentation_id $SEGMENTATION_ID} --shared | grep ' id ' | get_field 2)

+        NET_ID=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" network create $PHYSICAL_NETWORK --project $project_id --provider-network-type $PROVIDER_NETWORK_TYPE --provider-physical-network "$PHYSICAL_NETWORK" ${SEGMENTATION_ID:+--provider-segment $SEGMENTATION_ID} --share | grep ' id ' | get_field 2)

         die_if_not_set $LINENO NET_ID "Failure creating NET_ID for $PHYSICAL_NETWORK $project_id"

         if [[ "$IP_VERSION" =~ 4.* ]]; then

             if [ -z $SUBNETPOOL_V4_ID ]; then

                 fixed_range_v4=$FIXED_RANGE

             fi

-            SUBNET_ID=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" subnet-create --tenant_id $project_id --ip_version 4 ${ALLOCATION_POOL:+--allocation-pool $ALLOCATION_POOL} --name $PROVIDER_SUBNET_NAME --gateway $NETWORK_GATEWAY ${SUBNETPOOL_V4_ID:+--subnetpool $SUBNETPOOL_V4_ID} $NET_ID $fixed_range_v4 | grep ' id ' | get_field 2)

+            SUBNET_ID=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" subnet create --project $project_id --ip-version 4 ${ALLOCATION_POOL:+--allocation-pool $ALLOCATION_POOL} $PROVIDER_SUBNET_NAME --gateway $NETWORK_GATEWAY ${SUBNETPOOL_V4_ID:+--subnet-pool $SUBNETPOOL_V4_ID} --network $NET_ID --subnet-range $fixed_range_v4 | grep ' id ' | get_field 2)

             die_if_not_set $LINENO SUBNET_ID "Failure creating SUBNET_ID for $PROVIDER_SUBNET_NAME $project_id"

         fi

@@ -202,7 +202,7 @@ function create_neutron_initial_network {

             if [ -z $SUBNETPOOL_V6_ID ]; then

                 fixed_range_v6=$IPV6_PROVIDER_FIXED_RANGE

             fi

-            SUBNET_V6_ID=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" subnet-create --tenant_id $project_id --ip_version 6 --ipv6-address-mode $IPV6_ADDRESS_MODE --gateway $IPV6_PROVIDER_NETWORK_GATEWAY --name $IPV6_PROVIDER_SUBNET_NAME ${SUBNETPOOL_V6_ID:+--subnetpool $SUBNETPOOL_V6_ID} $NET_ID $fixed_range_v6 | grep 'id' | get_field 2)

+            SUBNET_V6_ID=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" subnet create --project $project_id --ip-version 6 --ipv6-address-mode $IPV6_ADDRESS_MODE --gateway $IPV6_PROVIDER_NETWORK_GATEWAY $IPV6_PROVIDER_SUBNET_NAME ${SUBNETPOOL_V6_ID:+--subnet-pool $SUBNETPOOL_V6_ID} --network $NET_ID $fixed_range_v6 | grep 'id' | get_field 2)

             die_if_not_set $LINENO SUBNET_V6_ID "Failure creating SUBNET_V6_ID for $IPV6_PROVIDER_SUBNET_NAME $project_id"

         fi

@@ -212,7 +212,7 @@ function create_neutron_initial_network {

             sudo ip link set $PUBLIC_INTERFACE up

         fi

     else

-        NET_ID=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" net-create --tenant-id $project_id "$PRIVATE_NETWORK_NAME" | grep ' id ' | get_field 2)

+        NET_ID=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" network create --project $project_id "$PRIVATE_NETWORK_NAME" | grep ' id ' | get_field 2)

         die_if_not_set $LINENO NET_ID "Failure creating NET_ID for $PRIVATE_NETWORK_NAME $project_id"

         if [[ "$IP_VERSION" =~ 4.* ]]; then

@@ -230,23 +230,23 @@ function create_neutron_initial_network {

         # Create a router, and add the private subnet as one of its interfaces

         if [[ "$Q_L3_ROUTER_PER_TENANT" == "True" ]]; then

             # create a tenant-owned router.

-            ROUTER_ID=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" router-create --tenant-id $project_id $Q_ROUTER_NAME | grep ' id ' | get_field 2)

+            ROUTER_ID=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" router create --project $project_id $Q_ROUTER_NAME | grep ' id ' | get_field 2)

             die_if_not_set $LINENO ROUTER_ID "Failure creating ROUTER_ID for $project_id $Q_ROUTER_NAME"

         else

             # Plugin only supports creating a single router, which should be admin owned.

-            ROUTER_ID=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" router-create $Q_ROUTER_NAME | grep ' id ' | get_field 2)

+            ROUTER_ID=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" router create $Q_ROUTER_NAME | grep ' id ' | get_field 2)

             die_if_not_set $LINENO ROUTER_ID "Failure creating ROUTER_ID for $Q_ROUTER_NAME"

         fi

-        EXTERNAL_NETWORK_FLAGS="--router:external"

+        EXTERNAL_NETWORK_FLAGS="--external"

         if is_networking_extension_supported "auto-allocated-topology"; then

-            EXTERNAL_NETWORK_FLAGS="$EXTERNAL_NETWORK_FLAGS --is-default"

+            EXTERNAL_NETWORK_FLAGS="$EXTERNAL_NETWORK_FLAGS --default"

         fi

         # Create an external network, and a subnet. Configure the external network as router gw

         if [ "$Q_USE_PROVIDERNET_FOR_PUBLIC" = "True" ]; then

-            EXT_NET_ID=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" net-create "$PUBLIC_NETWORK_NAME" -- $EXTERNAL_NETWORK_FLAGS --provider:network_type=flat --provider:physical_network=${PUBLIC_PHYSICAL_NETWORK} | grep ' id ' | get_field 2)

+            EXT_NET_ID=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" network create "$PUBLIC_NETWORK_NAME" $EXTERNAL_NETWORK_FLAGS --provider-network-type flat --provider-physical-network ${PUBLIC_PHYSICAL_NETWORK} | grep ' id ' | get_field 2)

         else

-            EXT_NET_ID=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" net-create "$PUBLIC_NETWORK_NAME" -- $EXTERNAL_NETWORK_FLAGS | grep ' id ' | get_field 2)

+            EXT_NET_ID=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" network create "$PUBLIC_NETWORK_NAME" $EXTERNAL_NETWORK_FLAGS | grep ' id ' | get_field 2)

         fi

         die_if_not_set $LINENO EXT_NET_ID "Failure creating EXT_NET_ID for $PUBLIC_NETWORK_NAME"

@@ -268,16 +268,16 @@ function _neutron_create_private_subnet_v4 {

     if [ -z $SUBNETPOOL_V4_ID ]; then

         fixed_range_v4=$FIXED_RANGE

     fi

-    local subnet_params="--tenant-id $project_id "

-    subnet_params+="--ip_version 4 "

+    local subnet_params="--project $project_id "

+    subnet_params+="--ip-version 4 "

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

         subnet_params+="--gateway $NETWORK_GATEWAY "

     fi

-    subnet_params+="--name $PRIVATE_SUBNET_NAME "

-    subnet_params+="${SUBNETPOOL_V4_ID:+--subnetpool $SUBNETPOOL_V4_ID} "

-    subnet_params+="$NET_ID $fixed_range_v4"

+    subnet_params+="${SUBNETPOOL_V4_ID:+--subnet-pool $SUBNETPOOL_V4_ID} "

+    subnet_params+="${fixed_range_v4:+--subnet-range $fixed_range_v4} "

+    subnet_params+="--network $NET_ID $PRIVATE_SUBNET_NAME"

     local subnet_id

-    subnet_id=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" subnet-create $subnet_params | grep ' id ' | get_field 2)

+    subnet_id=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" subnet create $subnet_params | grep ' id ' | get_field 2)

     die_if_not_set $LINENO subnet_id "Failure creating private IPv4 subnet for $project_id"

     echo $subnet_id

 }

@@ -291,52 +291,50 @@ function _neutron_create_private_subnet_v6 {

     if [ -z $SUBNETPOOL_V6_ID ]; then

         fixed_range_v6=$FIXED_RANGE_V6

     fi

-    local subnet_params="--tenant-id $project_id "

-    subnet_params+="--ip_version 6 "

+    local subnet_params="--project $project_id "

+    subnet_params+="--ip-version 6 "

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

         subnet_params+="--gateway $IPV6_PRIVATE_NETWORK_GATEWAY "

     fi

-    subnet_params+="--name $IPV6_PRIVATE_SUBNET_NAME "

-    subnet_params+="${SUBNETPOOL_V6_ID:+--subnetpool $SUBNETPOOL_V6_ID} "

-    subnet_params+="$NET_ID $fixed_range_v6 $ipv6_modes"

+    subnet_params+="${SUBNETPOOL_V6_ID:+--subnet-pool $SUBNETPOOL_V6_ID} "

+    subnet_params+="${fixed_range_v6:+--subnet-range $fixed_range_v6 $ipv6_modes} "

+    subnet_params+="--network $NET_ID $IPV6_PRIVATE_SUBNET_NAME "

     local ipv6_subnet_id

-    ipv6_subnet_id=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" subnet-create $subnet_params | grep ' id ' | get_field 2)

+    ipv6_subnet_id=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" subnet create $subnet_params | grep ' id ' | get_field 2)

     die_if_not_set $LINENO ipv6_subnet_id "Failure creating private IPv6 subnet for $project_id"

     echo $ipv6_subnet_id

 }

 # Create public IPv4 subnet

 function _neutron_create_public_subnet_v4 {

-    local subnet_params="--ip_version 4 "

+    local subnet_params="--ip-version 4 "

     subnet_params+="${Q_FLOATING_ALLOCATION_POOL:+--allocation-pool $Q_FLOATING_ALLOCATION_POOL} "

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

         subnet_params+="--gateway $PUBLIC_NETWORK_GATEWAY "

     fi

-    subnet_params+="--name $PUBLIC_SUBNET_NAME "

-    subnet_params+="$EXT_NET_ID $FLOATING_RANGE "

-    subnet_params+="-- --enable_dhcp=False"

+    subnet_params+="--network $EXT_NET_ID --subnet-range $FLOATING_RANGE --no-dhcp "

+    subnet_params+="$PUBLIC_SUBNET_NAME"

     local id_and_ext_gw_ip

-    id_and_ext_gw_ip=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" subnet-create $subnet_params | grep -e 'gateway_ip' -e ' id ')

+    id_and_ext_gw_ip=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" subnet create $subnet_params | grep -e 'gateway_ip' -e ' id ')

     die_if_not_set $LINENO id_and_ext_gw_ip "Failure creating public IPv4 subnet"

     echo $id_and_ext_gw_ip

 }

 # Create public IPv6 subnet

 function _neutron_create_public_subnet_v6 {

-    local subnet_params="--ip_version 6 "

+    local subnet_params="--ip-version 6 "

     subnet_params+="--gateway $IPV6_PUBLIC_NETWORK_GATEWAY "

-    subnet_params+="--name $IPV6_PUBLIC_SUBNET_NAME "

-    subnet_params+="$EXT_NET_ID $IPV6_PUBLIC_RANGE "

-    subnet_params+="-- --enable_dhcp=False"

+    subnet_params+="--network $EXT_NET_ID --subnet-range $IPV6_PUBLIC_RANGE --no-dhcp "

+    subnet_params+="$IPV6_PUBLIC_SUBNET_NAME"

     local ipv6_id_and_ext_gw_ip

-    ipv6_id_and_ext_gw_ip=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" subnet-create $subnet_params | grep -e 'gateway_ip' -e ' id ')

+    ipv6_id_and_ext_gw_ip=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" subnet create $subnet_params | grep -e 'gateway_ip' -e ' id ')

     die_if_not_set $LINENO ipv6_id_and_ext_gw_ip "Failure creating an IPv6 public subnet"

     echo $ipv6_id_and_ext_gw_ip

 }

 # Configure neutron router for IPv4 public access

 function _neutron_configure_router_v4 {

-    neutron --os-cloud devstack-admin --os-region "$REGION_NAME" router-interface-add $ROUTER_ID $SUBNET_ID

+    openstack --os-cloud devstack-admin --os-region "$REGION_NAME" router add subnet $ROUTER_ID $SUBNET_ID

     # Create a public subnet on the external network

     local id_and_ext_gw_ip

     id_and_ext_gw_ip=$(_neutron_create_public_subnet_v4 $EXT_NET_ID)

@@ -371,7 +369,7 @@ function _neutron_configure_router_v4 {

                 sudo ip addr add $ext_gw_ip/$cidr_len dev $ext_gw_interface

                 sudo ip link set $ext_gw_interface up

             fi

-            ROUTER_GW_IP=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" port-list -c fixed_ips -c device_owner | grep router_gateway | awk -F'ip_address'  '{ print $2 }' | cut -f3 -d\" | tr '\n' ' ')

+            ROUTER_GW_IP=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" port list -c 'Fixed IP Addresses' --device-owner network:router_gateway | awk -F'ip_address'  '{ print $2 }' | cut -f2 -d\' | tr '\n' ' ')

             die_if_not_set $LINENO ROUTER_GW_IP "Failure retrieving ROUTER_GW_IP"

             local replace_range=${SUBNETPOOL_PREFIX_V4}

             if [[ -z "${SUBNETPOOL_V4_ID}" ]]; then

@@ -385,7 +383,7 @@ function _neutron_configure_router_v4 {

 # Configure neutron router for IPv6 public access

 function _neutron_configure_router_v6 {

-    neutron --os-cloud devstack-admin --os-region "$REGION_NAME" router-interface-add $ROUTER_ID $IPV6_SUBNET_ID

+    openstack --os-cloud devstack-admin --os-region "$REGION_NAME" router add subnet $ROUTER_ID $IPV6_SUBNET_ID

     # Create a public subnet on the external network

     local ipv6_id_and_ext_gw_ip

     ipv6_id_and_ext_gw_ip=$(_neutron_create_public_subnet_v6 $EXT_NET_ID)

@@ -416,7 +414,7 @@ function _neutron_configure_router_v6 {

         sudo sysctl -w net.ipv6.conf.all.forwarding=1

         # Configure and enable public bridge

         # Override global IPV6_ROUTER_GW_IP with the true value from neutron

-        IPV6_ROUTER_GW_IP=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" port-list -c fixed_ips | grep $ipv6_pub_subnet_id | awk -F'ip_address' '{ print $2 }' | cut -f3 -d\" | tr '\n' ' ')

+        IPV6_ROUTER_GW_IP=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" port list -c 'Fixed IP Addresses' | grep $ipv6_pub_subnet_id | awk -F'ip_address' '{ print $2 }' | cut -f2 -d\' | tr '\n' ' ')

         die_if_not_set $LINENO IPV6_ROUTER_GW_IP "Failure retrieving IPV6_ROUTER_GW_IP"

         if is_neutron_ovs_base_plugin; then

@@ -446,6 +444,6 @@ function is_provider_network {

 function is_networking_extension_supported {

     local extension=$1

     # TODO(sc68cal) cache this instead of calling every time

-    EXT_LIST=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" ext-list -c alias -f value)

+    EXT_LIST=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" extension list --network -c Alias -f value)

     [[ $EXT_LIST =~ $extension ]] && return 0

 }

@@ -242,7 +242,7 @@ function configure_tempest {

     # the public network (for floating ip access) is only available

     # if the extension is enabled.

     if is_networking_extension_supported 'external-net'; then

-        public_network_id=$(neutron net-list | grep $PUBLIC_NETWORK_NAME | \

+        public_network_id=$(openstack network list | grep $PUBLIC_NETWORK_NAME | \

             awk '{print $2}')

     fi

@@ -54,7 +54,7 @@ fi

 REMAINING_ARGS="${@:2}"

 # BUG: with duplicate network names, this fails pretty hard.

-NET_ID=$(neutron net-list | grep "$NET_NAME" | awk '{print $2}')

+NET_ID=$(openstack network list | grep "$NET_NAME" | awk '{print $2}')

 PROBE_ID=$(neutron-debug probe-list -c id -c network_id | grep "$NET_ID" | awk '{print $2}' | head -n 1)

 # This runs a command inside the specific netns