Pulled new Charm for VyOS and fixed space in VNF name

diff --git a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml b/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
index 86fc0f3..901eaec 100644 (file)
--- a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
+++ b/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
@@ -1,8 +1,8 @@
 vnfd:vnfd-catalog:
     vnfd:
     -   id: VyOS
-        name: VyOS Router
-        short-name: VyOS Router
+        name: VyOS
+        short-name: VyOS
         description: VyOS Router
         logo: osm_2x.png
         mgmt-interface:

diff --git a/src/vnfd/VyOS_vnf/charms/VyOS-proxy/layer.yaml b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/layer.yaml
index 8862f25..16ac9ce 100644 (file)
--- a/src/vnfd/VyOS_vnf/charms/VyOS-proxy/layer.yaml
+++ b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/layer.yaml
@@ -1,9 +1,12 @@
 "options":
-  "vyos-proxy": {}
   "basic":
+    "packages":
+    - "python-dev"
+    - "libffi-dev"
+    - "libssl-dev"
     "use_venv": !!bool "false"
-    "packages": []
     "include_system_packages": !!bool "false"
+  "vyos-proxy": {}
 "includes":
 - "layer:basic"
 "is": "vyos-proxy"

diff --git a/src/vnfd/VyOS_vnf/charms/VyOS-proxy/reactive/vyos_proxy.py b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/reactive/vyos_proxy.py
index 8e8b3b8..a8fd5e0 100644 (file)
--- a/src/vnfd/VyOS_vnf/charms/VyOS-proxy/reactive/vyos_proxy.py
+++ b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/reactive/vyos_proxy.py
@@ -41,13 +41,13 @@ def vyos_proxy_ready():
     set_flag('vyos-proxy.ready')
 
 
-@when('action.ping')
+@when('actions.ping')
 @when_not('vyos-proxy.configured')
 def pingme():
     action_fail('proxy is not ready')
 
 
-@when('action.ping')
+@when('actions.ping')
 @when('vyos-proxy.configured')
 def pingme_forreal():
     try:
@@ -55,10 +55,10 @@ def pingme_forreal():
     except:
         action_fail('ping command failed')
     finally:
-        remove_flag('action.ping')
+        remove_flag('actions.ping')
 
     # Here you can send results back from ping, if you had time to parse it
-    action_set(result)
+    action_set({'output': result})
 
 
 
@@ -83,8 +83,11 @@ def run(cmd):
     client = paramiko.SSHClient()
     client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 
-    client.connect(cfg.get('hostname'), port=22,
-                   username=cfg.get('user'), password=cfg.get('pass'))
+    try:
+        client.connect(cfg.get('hostname'), port=22,
+                       username=cfg.get('user'), password=cfg.get('pass'))
+    except paramiko.ssh_exception.AuthenticationException:
+        raise MgmtNotConfigured('invalid credentials')
 
     stdin, stdout, stderr = client.exec_command(cmd)
     retcode = stdout.channel.recv_exit_status()

diff --git a/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/cffi-1.7.0.tar.gz b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/cffi-1.7.0.tar.gz
new file mode 100644 (file)
index 0000000..55da260
Binary files /dev/null and b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/cffi-1.7.0.tar.gz differ

diff --git a/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/cryptography-1.4.tar.gz b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/cryptography-1.4.tar.gz
new file mode 100644 (file)
index 0000000..e7dfece
Binary files /dev/null and b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/cryptography-1.4.tar.gz differ

diff --git a/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/idna-2.1.tar.gz b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/idna-2.1.tar.gz
new file mode 100644 (file)
index 0000000..c028c71
Binary files /dev/null and b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/idna-2.1.tar.gz differ

diff --git a/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/paramiko-2.0.1.tar.gz b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/paramiko-2.0.1.tar.gz
new file mode 100644 (file)
index 0000000..6f2d318
Binary files /dev/null and b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/paramiko-2.0.1.tar.gz differ

diff --git a/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/pyasn1-0.1.9.tar.gz b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/pyasn1-0.1.9.tar.gz
new file mode 100644 (file)
index 0000000..1900b07
Binary files /dev/null and b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/pyasn1-0.1.9.tar.gz differ

diff --git a/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/pycparser-2.14.tar.gz b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/pycparser-2.14.tar.gz
new file mode 100644 (file)
index 0000000..6cdaab1
Binary files /dev/null and b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/pycparser-2.14.tar.gz differ

diff --git a/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/setuptools-23.1.0.zip b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/setuptools-23.1.0.zip
new file mode 100644 (file)
index 0000000..23e512a
Binary files /dev/null and b/src/vnfd/VyOS_vnf/charms/VyOS-proxy/wheelhouse/setuptools-23.1.0.zip differ