Merge "migrating to proposed common network settings file"

diff --combined lib/common-functions.sh
index 4dd8a13,ee9ed4e..2d11345
--- 1/lib/common-functions.sh
--- 2/lib/common-functions.sh
+++ b/lib/common-functions.sh
@@@ -33,12 -33,12 +33,12 @@@ function find_ip 
      af=$2
    fi
  
-   python3.4 -B $LIB/python/apex_python_utils.py find-ip -i $1 -af $af
+   python3 -B $LIB/python/apex_python_utils.py find-ip -i $1 -af $af
  }
  
  ##attach interface to OVS and set the network config correctly
  ##params: bride to attach to, interface to attach, network type (optional)
- ##public indicates attaching to a public interface
+ ##external indicates attaching to a external interface
  function attach_interface_to_ovs {
    local bridge interface
    local if_ip if_mask if_gw if_file ovs_file if_prefix
@@@ -72,15 -72,15 +72,15 @@@
  
    if [ -z "$if_mask" ]; then
      # we can look for PREFIX here, then convert it to NETMASK
 -    if_prefix=$(sed -n 's/^PREFIX=\(.*\)$/\1/p' ${if_file})
 +    if_prefix=$(sed -n 's/^PREFIX=[^0-9]*\([0-9][0-9]*\)[^0-9]*$/\1/p' ${if_file})
      if_mask=$(prefix2mask ${if_prefix})
    fi
  
    if [[ -z "$if_ip" || -z "$if_mask" ]]; then
      echo "ERROR: IPADDR or NETMASK/PREFIX missing for ${interface}"
      return 1
-   elif [[ -z "$if_gw" && "$3" == "public_network" ]]; then
-     echo "ERROR: GATEWAY missing for ${interface}, which is public"
+   elif [[ -z "$if_gw" && "$3" == "external" ]]; then
+     echo "ERROR: GATEWAY missing for ${interface}, which is external"
      return 1
    fi
  

diff --combined lib/parse-functions.sh
index 87453ea,ff31bfe..4b3d234
--- 1/lib/parse-functions.sh
--- 2/lib/parse-functions.sh
+++ b/lib/parse-functions.sh
@@@ -10,6 -10,46 +10,6 @@@
  
  # Parser functions used by OPNFV Apex
  
 -##translates yaml into variables
 -##params: filename, prefix (ex. "config_")
 -##usage: parse_yaml opnfv_ksgen_settings.yml "config_"
 -parse_yaml() {
 -   local prefix=$2
 -   local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034')
 -   sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \
 -        -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p"  $1 |
 -   awk -F$fs '{
 -      indent = length($1)/2;
 -      vname[indent] = $2;
 -      for (i in vname) {if (i > indent) {delete vname[i]}}
 -      if (length($3) > 0) {
 -         vn=""; for (i=0; i<indent; i++) {vn=(vn)(vname[i])("_")}
 -         printf("%s%s%s=%s\n", "'$prefix'",vn, $2, $3);
 -      }
 -   }'
 -}
 -
 -##parses variable from a string with '='
 -##and removes global prefix
 -##params: string, prefix
 -##usage: parse_setting_var 'deploy_myvar=2' 'deploy_'
 -parse_setting_var() {
 -  local mystr=$1
 -  local prefix=$2
 -  if echo $mystr | grep -E "^.+\=" > /dev/null; then
 -    echo $(echo $mystr | grep -Eo "^.+\=" | tr -d '=' |  sed 's/^'"$prefix"'//')
 -  else
 -    return 1
 -  fi
 -}
 -##parses value from a string with '='
 -##params: string
 -##usage: parse_setting_value
 -parse_setting_value() {
 -  local mystr=$1
 -  echo $(echo $mystr | grep -Eo "\=.*$" | tr -d '=')
 -}
 -
  ##parses network settings yaml into globals
  parse_network_settings() {
    local output parse_ext
@@@ -38,7 -78,7 +38,7 @@@
        echo -e "${red}ERROR: flat network is not supported with ovs-dpdk ${reset}"
        exit 1
      fi
-     if [[ ! $enabled_network_list =~ "private_network" ]]; then
+     if [[ ! $enabled_network_list =~ "tenant" ]]; then
        echo -e "${red}ERROR: tenant network is not enabled for ovs-dpdk ${reset}"
        exit 1
      fi