From 916c46f8842836f98545b202a49af058d763d45e Mon Sep 17 00:00:00 2001
From: Arvind Somya <asomya@cisco.com>
Date: Fri, 9 Jun 2017 14:25:11 -0400
Subject: [PATCH] Fixing devstack issues

This patch fixes two devstack issues with the ASR1k plugin:
- Incorrect config file paths
- Implement the NEUTRON_CREATE_INITIAL_NETWORKS flag

Change-Id: I1d6e73026809da76fa6ed8126ba4146176ee97cd
---
 devstack/csr1kv/cisco_neutron |  2 +-
 devstack/csr1kv/cisco_router  | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/devstack/csr1kv/cisco_neutron b/devstack/csr1kv/cisco_neutron
index 7ccc0c9..fe102cb 100644
--- a/devstack/csr1kv/cisco_neutron
+++ b/devstack/csr1kv/cisco_neutron
@@ -189,7 +189,7 @@ function setup_for_csr1kv {
 }
 
 function net_create_neutron_initial_network {
-      if [[ "$Q_L3_ENABLED" == "True" ]]; then
+      if [ "$Q_L3_ENABLED" == "True" && $NEUTRON_CREATE_INITIAL_NETWORK = "True" ]; then
         # 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.
diff --git a/devstack/csr1kv/cisco_router b/devstack/csr1kv/cisco_router
index f1a58c8..1d9264d 100644
--- a/devstack/csr1kv/cisco_router
+++ b/devstack/csr1kv/cisco_router
@@ -13,8 +13,11 @@ CISCO_DEVMGR_PLUGIN=networking_cisco.plugins.cisco.service_plugins.cisco_device_
 CISCO_ROUTER_PLUGIN_CONF_FILE=cisco_router_plugin.ini
 CISCO_DEVMGR_PLUGIN_CONF_FILE=cisco_device_manager_plugin.ini
 
-PLUGIN_CONFIG_DIR=$NEUTRON_CONF_DIR/plugins/cisco
-NET_CISCO_CONF_DIR=$DIR_CISCO/etc/neutron/plugins/cisco
+NET_CISCO_SOURCE_CONF_DIR=etc/neutron/plugins/cisco
+NET_CISCO_PLUGIN_DIR=/plugins/cisco
+PLUGIN_CONFIG_DIR=$NEUTRON_CONF_DIR$NET_CISCO_PLUGIN_DIR
+NET_CISCO_CONF_DIR=$DIR_CISCO$PLUGIN_CONFIG_DIR
+
 
 function neutron_cisco_router_configure_common() {
     Q_L3_ENABLED=True
@@ -27,11 +30,17 @@ function neutron_cisco_router_configure_common() {
 
     mkdir -p $PLUGIN_CONFIG_DIR
 
-    cp $NET_CISCO_CONF_DIR/$CISCO_ROUTER_PLUGIN_CONF_FILE $PLUGIN_CONFIG_DIR/
-    cp $NET_CISCO_CONF_DIR/$CISCO_DEVMGR_PLUGIN_CONF_FILE $PLUGIN_CONFIG_DIR/
+    cp $NET_CISCO_SOURCE_CONF_DIR/$CISCO_ROUTER_PLUGIN_CONF_FILE $PLUGIN_CONFIG_DIR/
+    cp $NET_CISCO_SOURCE_CONF_DIR/$CISCO_DEVMGR_PLUGIN_CONF_FILE $PLUGIN_CONFIG_DIR/
 
-    Q_CISCO_ROUTER_PLUGIN_CONF_FILE=$PLUGIN_CONFIG_DIR/$CISCO_ROUTER_PLUGIN_CONF_FILE
-    Q_CISCO_DEVMGR_PLUGIN_CONF_FILE=$PLUGIN_CONFIG_DIR/$CISCO_DEVMGR_PLUGIN_CONF_FILE
+    NEUTRON_VERSION=$(pip show neutron | grep Version| egrep -o '[0-9]+' | head -1)
+    if [[ NEUTRON_VERSION -ge 10 ]]; then
+        Q_CISCO_ROUTER_PLUGIN_CONF_FILE=$NET_CISCO_PLUGIN_DIR/$CISCO_ROUTER_PLUGIN_CONF_FILE
+        Q_CISCO_DEVMGR_PLUGIN_CONF_FILE=$NET_CISCO_PLUGIN_DIR/$CISCO_DEVMGR_PLUGIN_CONF_FILE
+    else
+        Q_CISCO_ROUTER_PLUGIN_CONF_FILE=$PLUGIN_CONFIG_DIR/$CISCO_ROUTER_PLUGIN_CONF_FILE
+        Q_CISCO_DEVMGR_PLUGIN_CONF_FILE=$PLUGIN_CONFIG_DIR/$CISCO_DEVMGR_PLUGIN_CONF_FILE
+    fi
 
     Q_PLUGIN_EXTRA_CONF_FILES=(${Q_PLUGIN_EXTRA_CONF_FILES[@]} $Q_CISCO_ROUTER_PLUGIN_CONF_FILE)
     Q_PLUGIN_EXTRA_CONF_FILES=(${Q_PLUGIN_EXTRA_CONF_FILES[@]} $Q_CISCO_DEVMGR_PLUGIN_CONF_FILE)
@@ -44,7 +53,7 @@ function neutron_cisco_router_configure_common() {
 
     _patch_neutron_legacy
 
-    iniset $Q_CISCO_ROUTER_PLUGIN_CONF_FILE routing default_router_type $Q_CISCO_DEFAULT_ROUTER_TYPE
+    iniset $NEUTRON_CONF_DIR$Q_CISCO_ROUTER_PLUGIN_CONF_FILE routing default_router_type $Q_CISCO_DEFAULT_ROUTER_TYPE
 
  }
 
@@ -61,13 +70,13 @@ function _inject_deployer_config() {
     ROUTER_INJECT_FILE=$TOP_DIR/cisco_router_plugin.inject
     # inject any deployer provided configurations
     if [[ -f $ROUTER_INJECT_FILE ]]; then
-        cat $ROUTER_INJECT_FILE >> $Q_CISCO_ROUTER_PLUGIN_CONF_FILE
+        cat $ROUTER_INJECT_FILE >> $NEUTRON_CONF_DIR$Q_CISCO_ROUTER_PLUGIN_CONF_FILE
     fi
 
     # Inject device manager configs
     DEVMGR_INJECT_FILE=$TOP_DIR/cisco_device_manager_plugin.inject
     if [[ -f $DEVMGR_INJECT_FILE ]]; then
-        cat $DEVMGR_INJECT_FILE >> $Q_CISCO_DEVMGR_PLUGIN_CONF_FILE
+        cat $DEVMGR_INJECT_FILE >> $NEUTRON_CONF_DIR$Q_CISCO_DEVMGR_PLUGIN_CONF_FILE
     fi
 }