Merge "Added new descriptors for R3 testing"
diff --git a/descriptor-packages/nsd/ping_pong_ns/src/ping_pong_nsd.yaml b/descriptor-packages/nsd/ping_pong_ns/src/ping_pong_nsd.yaml
index 347c78e..ec13b26 100644
--- a/descriptor-packages/nsd/ping_pong_ns/src/ping_pong_nsd.yaml
+++ b/descriptor-packages/nsd/ping_pong_ns/src/ping_pong_nsd.yaml
@@ -74,6 +74,7 @@
description: Management VL
name: mgmt_vl
short-name: mgmt_vl
+ vim-network-name: mgmt
type: ELAN
vendor: RIFT.io
version: '1.0'
diff --git a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
index 8aa7817..f51012d 100644
--- a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
+++ b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
@@ -31,7 +31,6 @@
type: VPORT
http-endpoint:
- path: api/v1/ping/stats
- polling_interval_secs: '2'
port: '18888'
mgmt-interface:
dashboard-params:
@@ -50,11 +49,13 @@
count: '1'
interface:
- name: eth0
+ position: 0
type: EXTERNAL
virtual-interface:
type: VIRTIO
external-connection-point-ref: ping_vnfd/cp0
- name: eth1
+ position: 1
type: EXTERNAL
virtual-interface:
type: VIRTIO
@@ -67,7 +68,7 @@
storage-gb: '4'
vcpu-count: '1'
vnf-configuration:
- service-primitive:
+ config-primitive:
- name: start
- name: stop
- name: restart
diff --git a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
index 33082f1..4c49888 100644
--- a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
+++ b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
@@ -31,7 +31,6 @@
type: VPORT
http-endpoint:
- path: api/v1/pong/stats
- polling_interval_secs: '2'
port: '18889'
mgmt-interface:
dashboard-params:
@@ -50,11 +49,13 @@
count: '1'
interface:
- name: eth0
+ position: 0
type: EXTERNAL
virtual-interface:
type: VIRTIO
external-connection-point-ref: pong_vnfd/cp0
- name: eth1
+ position: 1
type: EXTERNAL
virtual-interface:
type: VIRTIO
@@ -67,7 +68,7 @@
storage-gb: '4'
vcpu-count: '1'
vnf-configuration:
- service-primitive:
+ config-primitive:
- name: start
- name: stop
- name: restart
diff --git a/juju-charms/layers/pingpong/reactive/pingpong.py b/juju-charms/layers/pingpong/reactive/pingpong.py
old mode 100644
new mode 100755
index b5a5db9..7a91f89
--- a/juju-charms/layers/pingpong/reactive/pingpong.py
+++ b/juju-charms/layers/pingpong/reactive/pingpong.py
@@ -63,16 +63,16 @@
remove_flag('actions.start')
return
+ # Attempt to raise the non-mgmt interface, but ignore failures if
+ # the interface is already up.
try:
- cmd = "sudo timeout 30 /sbin/ifup eth1"
+ cmd = "sudo timeout 30 /sbin/ifup eth1"
result, err = charms.sshproxy._run(cmd)
except Exception as e:
- action_fail('command failed: {}, errors: {}'.format(e, e.output))
- remove_flag('actions.start')
- return
+ pass
try:
- cmd = "sudo timeout 30 /usr/bin/systemctl start {}". \
+ cmd = "sudo timeout 30 /usr/bin/systemctl start {}". \
format(cfg['mode'])
result, err = charms.sshproxy._run(cmd)
except Exception as e: