Merge "Refreshing osm_metrics stack"

diff --git a/descriptor-packages/vnfd/hackfest_basic_vnf/src/hackfest_basic_vnfd.yaml b/descriptor-packages/vnfd/hackfest_basic_vnf/src/hackfest_basic_vnfd.yaml
index fa7f1ff..b407a84 100644 (file)
--- a/descriptor-packages/vnfd/hackfest_basic_vnf/src/hackfest_basic_vnfd.yaml
+++ b/descriptor-packages/vnfd/hackfest_basic_vnf/src/hackfest_basic_vnfd.yaml
@@ -1,29 +1,29 @@
 vnfd:vnfd-catalog:
-    vnfd:vnfd:
-    -   vnfd:id: hackfest_basic-vnf
-        vnfd:name: hackfest_basic-vnf
-        vnfd:short-name: hackfest_basic-vnf
-        vnfd:version: '1.0'
-        vnfd:description: A basic VNF descriptor w/ one VDU
-        vnfd:logo: osm.png
-        vnfd:connection-point:
-        -   vnfd:name: vnf-cp0
-            vnfd:type: VPORT
-        vnfd:vdu:
-        -   vnfd:id: hackfest_basic-VM
-            vnfd:name: hackfest_basic-VM
-            vnfd:image: ubuntu1604
-            vnfd:count: '1'
-            vnfd:vm-flavor:
-                vnfd:vcpu-count: '1'
-                vnfd:memory-mb: '1024'
-                vnfd:storage-gb: '10'
-            vnfd:interface:
-            -   vnfd:name: vdu-eth0
-                vnfd:type: EXTERNAL
-                vnfd:virtual-interface:
-                    vnfd:type: VIRTIO
-                vnfd:external-connection-point-ref: vnf-cp0
-        vnfd:mgmt-interface:
-            vnfd:cp: vnf-cp0
+    vnfd:
+    -   id: hackfest_basic-vnf
+        name: hackfest_basic-vnf
+        short-name: hackfest_basic-vnf
+        version: '1.0'
+        description: A basic VNF descriptor w/ one VDU
+        logo: osm.png
+        connection-point:
+        -   name: vnf-cp0
+            type: VPORT
+        vdu:
+        -   id: hackfest_basic-VM
+            name: hackfest_basic-VM
+            image: ubuntu1604
+            count: '1'
+            vm-flavor:
+                vcpu-count: '1'
+                memory-mb: '1024'
+                storage-gb: '10'
+            interface:
+            -   name: vdu-eth0
+                type: EXTERNAL
+                virtual-interface:
+                    type: VIRTIO
+                external-connection-point-ref: vnf-cp0
+        mgmt-interface:
+            cp: vnf-cp0
 

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 0da9c91..390c8df 100644 (file)
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -28,7 +28,7 @@ RUN apt-get update && apt-get -y install curl software-properties-common
 
 RUN apt-get --yes update \
  && apt-get --yes install git python python-pip python3 python3-pip libmysqlclient-dev libssl-dev libffi-dev \
- && pip3 install pip==9.0.3
+ && apt-get --yes install python3-pymongo && pip3 install pip==9.0.3
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
 ARG RELEASE=ReleaseFOUR-daily

diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index 2ab11d6..899adb1 100755 (executable)
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -13,12 +13,12 @@ add_repo() {
     dpkg -l $need_packages_lw &>/dev/null \
       || ! echo -e "One or several required packages are not installed. Updating apt cache requires root privileges." \
       || sudo apt-get -q update \
-      || ! echo "failed to run apt-get update"
+      || ! echo "failed to run apt-get update" \
       || exit 1
     dpkg -l $need_packages_lw &>/dev/null \
       || ! echo -e "Installing $need_packages_lw requires root privileges." \
       || sudo apt-get install -y $need_packages_lw \
-      || ! echo "failed to install $need_packages_lw"
+      || ! echo "failed to install $need_packages_lw" \
       || exit 1
     wget -qO - $REPOSITORY_BASE/$RELEASE/OSM%20ETSI%20Release%20Key.gpg | sudo apt-key add -
     sudo DEBIAN_FRONTEND=noninteractive add-apt-repository -y "$1" && sudo DEBIAN_FRONTEND=noninteractive apt-get update

diff --git a/juju-charms/layers/simple/metadata.yaml b/juju-charms/layers/simple/metadata.yaml
index 1105105..fd80d1a 100644 (file)
--- a/juju-charms/layers/simple/metadata.yaml
+++ b/juju-charms/layers/simple/metadata.yaml
@@ -1,5 +1,5 @@
 name: simple
-summary: A simple VNF proxy charm 
+summary: A simple VNF proxy charm
 maintainer: Adam Israel <adam.israel@canonical.com>
 subordinate: false
 series: ['xenial']

diff --git a/juju-charms/layers/simple/reactive/simple.py b/juju-charms/layers/simple/reactive/simple.py
index 8355bf3..228be3c 100644 (file)
--- a/juju-charms/layers/simple/reactive/simple.py
+++ b/juju-charms/layers/simple/reactive/simple.py
@@ -39,6 +39,6 @@ def touch():
     except:
         action_fail('command failed:' + err)
     else:
-        action_set({'outout': result})
+        action_set({'output': result})
     finally:
         clear_flag('actions.touch')