Merge "Stability improvements"

diff --git a/BUILD.sh b/BUILD.sh
index f07940f..7ccdeba 100755 (executable)
--- a/BUILD.sh
+++ b/BUILD.sh
@@ -79,8 +79,8 @@ set -x             # Print commands before executing them
 ###############################################################################
 # Set up repo and version
 
-PLATFORM_REPOSITORY=${1:-osm-rbac}
-PLATFORM_VERSION=${2:-5.1.3.9999.70283}
+PLATFORM_REPOSITORY=${1:-OSM3}
+PLATFORM_VERSION=${2:-5.2.0.2.72254}
 
 ###############################################################################
 # Main block
@@ -106,6 +106,13 @@ else
 
     # Install environment to build module
     sudo -H /usr/rift/container_tools/mkcontainer --modes $MODULE-dev --repo ${PLATFORM_REPOSITORY} --rw-version ${PLATFORM_VERSION}
+    sudo -H pip3 install --upgrade pip
+    sudo -H pip3 install setuptools 
+    sudo -H pip3 install juju 
+    sudo mkdir -p /usr/rift/etc/default
+    sudo chmod 777 /usr/rift/etc/default
+    echo LAUNCHPAD_OPTIONS="--use-xml-mode" >> /usr/rift/etc/default/launchpad
+    sudo systemctl daemon-reload
 
     # Build  and install module
     make -j16 

diff --git a/common/python/rift/mano/ro_account/accounts.py b/common/python/rift/mano/ro_account/accounts.py
index 74e5ea2..57f7070 100644 (file)
--- a/common/python/rift/mano/ro_account/accounts.py
+++ b/common/python/rift/mano/ro_account/accounts.py
@@ -103,13 +103,14 @@ class ROAccount(object):
                 details="RO account connection status check in progress"
                 )
         try:
-            self._datacenters = []
+            datacenter_copy = []
             for uuid, name in self._ro_plugin._cli_api.datacenter_list():
-                self._datacenters.append({
+                datacenter_copy.append({
                             'uuid':uuid,
                             'name':name
                             }
                         )
+            self._datacenters = datacenter_copy
             self._status = RwRoAccountYang.YangData_RwProject_Project_RoAccountState_Account_ConnectionStatus(
                 status="success",
                 details="RO account connection status success"

diff --git a/models/plugins/yang/vnfr.yang b/models/plugins/yang/vnfr.yang
index ebccf12..b669f97 100644 (file)
--- a/models/plugins/yang/vnfr.yang
+++ b/models/plugins/yang/vnfr.yang
@@ -74,6 +74,7 @@ module vnfr
       enum vm-init-phase;
       enum vm-alloc-pending;
       enum running;
+      enum upgrading;
       enum terminate;
       enum vl-terminate-phase;
       enum terminated;
@@ -88,6 +89,7 @@ module vnfr
       enum vl-init-phase;
       enum vm-init-phase;
       enum running;
+      enum upgrading;   // Experimental
       enum terminate;
       enum vm-terminate-phase;
       enum vl-terminate-phase;
@@ -543,6 +545,7 @@ module vnfr
                 vm-init-phase       : The VDUs in the VNF is being created in VIM.
                 vm-alloc-pending    : The  VM alloc is pending in VIM
                 running             : The VDU is active in VM
+                upgrading           : The VDU is being upgraded (EXPERIMENTAL)
                 terminate           : The VDU is being terminated
                 vm-terminate-phase  : The VDU in the VNF is being terminated in VIM.
                 terminated          : The VDU is in the terminated state.