Merge "migrating to proposed common network settings file"

diff --git a/docs/installationprocedure/architecture.rst b/docs/installationprocedure/architecture.rst
index f1861d0..c2b38d0 100644 (file)
--- a/docs/installationprocedure/architecture.rst
+++ b/docs/installationprocedure/architecture.rst
@@ -105,31 +105,32 @@ the installer as a (-d) deploy setting.  Read further in the Apex documentation
 to learn more about invoking the deploy command.  Below is quick reference
 matrix for OPNFV scenarios supported in Apex.  Please refer to the respective
 OPNFV Docs documentation for each scenario in order to see a full scenario
-description.  The following scenarios correspond to a supported <Scenario>.yaml
-deploy settings file:
+description.  Also, please refer to release-notes for information about known
+issues per scenario.  The following scenarios correspond to a supported
+<Scenario>.yaml deploy settings file:
 
 +-------------------------+------------+-----------------+
-| **Scenario**            | **Owner**  | **Known Issues**|
+| **Scenario**            | **Owner**  | **Supported**   |
 +-------------------------+------------+-----------------+
-| os-nosdn-nofeature-ha   | Apex       |                 |
+| os-nosdn-nofeature-ha   | Apex       | Yes             |
 +-------------------------+------------+-----------------+
-| os-nosdn-nofeature-noha | Apex       |                 |
+| os-nosdn-nofeature-noha | Apex       | Yes             |
 +-------------------------+------------+-----------------+
-| os-nosdn-ovs-noha       | OVS for NFV|                 |
+| os-nosdn-ovs-noha       | OVS for NFV| Yes             |
 +-------------------------+------------+-----------------+
-| os-nosdn-fdio-noha      | FDS        |                 |
+| os-nosdn-fdio-noha      | FDS        | Yes             |
 +-------------------------+------------+-----------------+
-| os-odl_l2-nofeature-ha  | Apex       |                 |
+| os-odl_l2-nofeature-ha  | Apex       | Yes             |
 +-------------------------+------------+-----------------+
-| os-odl_l3-nofeature-ha  | Apex       | APEX-112        |
+| os-odl_l3-nofeature-ha  | Apex       | Yes             |
 +-------------------------+------------+-----------------+
-| os-odl_l2-sfc-noha      | SFC        |                 |
+| os-odl_l2-sfc-noha      | SFC        | Yes             |
 +-------------------------+------------+-----------------+
-| os-odl_l2-bgpvpn-noha   | SDNVPN     |                 |
+| os-odl_l2-bgpvpn-ha     | SDNVPN     | No              |
 +-------------------------+------------+-----------------+
-| os-odl_l2-fdio-noha     | FDS        |                 |
+| os-odl_l2-fdio-noha     | FDS        | Yes             |
 +-------------------------+------------+-----------------+
-| os-onos-nofeature-ha    | ONOSFW     |                 |
+| os-onos-nofeature-ha    | ONOSFW     | Yes             |
 +-------------------------+------------+-----------------+
-| os-onos-sfc-ha          | ONOSFW     |                 |
+| os-onos-sfc-ha          | ONOSFW     | Yes             |
 +-------------------------+------------+-----------------+

diff --git a/docs/installationprocedure/requirements.rst b/docs/installationprocedure/requirements.rst
index d54d584..1b3fe87 100644 (file)
--- a/docs/installationprocedure/requirements.rst
+++ b/docs/installationprocedure/requirements.rst
@@ -46,14 +46,13 @@ Network requirements include:
        deployment. The External network is where public internet access would
        reside if available.
 
-\* *These networks can be combined with each other or all combined on the
-    Control Plane network.*
-\* *Non-External networks will be consolidated to the Control Plane network
-    if not specifically configured.*
-\*\* *Internal API network, by default, is collapsed with provisioning in IPv4
-     deployments, this is not possible with the current lack of PXE boot
-     support and therefore the API network is required to be its own
-     network in an IPv6 deployment.*
+\*These networks can be combined with each other or all combined on the
+Control Plane network.
+
+\*\*Internal API network, by default, is collapsed with provisioning in IPv4
+deployments, this is not possible with the current lack of PXE boot
+support and therefore the API network is required to be its own
+network in an IPv6 deployment.
 
 Bare Metal Node Requirements
 ----------------------------

diff --git a/docs/releasenotes/release-notes.rst b/docs/releasenotes/release-notes.rst
index 96d654a..52b676e 100644 (file)
--- a/docs/releasenotes/release-notes.rst
+++ b/docs/releasenotes/release-notes.rst
@@ -300,6 +300,18 @@ Scenario os-odl_l2-nofeature known issues
 * `APEX-149 <https://jira.opnfv.org/browse/APEX-149>`_:
    Openflow rules are populated very slowly
 
+Scenario os-odl_l2-bgpvpn known issues
+--------------------------------------
+
+* `APEX-278 <https://jira.opnfv.org/browse/APEX-278>`_:
+   Duplicate neutron config class declaration for SDNVPN
+
+Scenario os-onos-nofeatures/os-onos-sfc known issues
+----------------------------------------------------
+
+* `APEX-281 <https://jira.opnfv.org/browse/APEX-281>`_:
+   ONOS sometimes fails to provide addresses to instances
+
 Scenario os-odl_l2-sfc-noha known issues
 ----------------------------------------
 

diff --git a/lib/common-functions.sh b/lib/common-functions.sh
index ee9ed4e..2d11345 100644 (file)
--- a/lib/common-functions.sh
+++ b/lib/common-functions.sh
@@ -72,7 +72,7 @@ function attach_interface_to_ovs {
 
   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
 

diff --git a/lib/parse-functions.sh b/lib/parse-functions.sh
index ff31bfe..4b3d234 100755 (executable)
--- a/lib/parse-functions.sh
+++ b/lib/parse-functions.sh
@@ -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