Merge "switch from CLI to REST for consistency and because the CLI hates question marks"
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 268504c..675a7b2 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
@@ -29,7 +29,7 @@
nsd:vnfd-id-ref: rift_ping_vnf
- nsd:member-vnf-index: '2'
nsd:vnfd-id-ref: rift_pong_vnf
- nsd:initial-config-primitive:
+ nsd:initial-service-primitive:
- nsd:name: start traffic
nsd:parameter:
- nsd:name: port
diff --git a/descriptor-packages/tools/generate_descriptor_pkg.sh b/descriptor-packages/tools/generate_descriptor_pkg.sh
index d076b28..5cf2510 100755
--- a/descriptor-packages/tools/generate_descriptor_pkg.sh
+++ b/descriptor-packages/tools/generate_descriptor_pkg.sh
@@ -220,7 +220,7 @@
# Add external interfaces
cat >>$desc_file <<EOF
- external-interface:
+ interface:
# Specify the external interfaces
# There can be multiple interfaces defined
EOF
@@ -228,11 +228,12 @@
# Add mgmt interface
cat >>$desc_file <<EOF
- name: eth0
+ type: EXTERNAL
virtual-interface:
type: VIRTIO
bandwidth: '0'
vpci: '0000:00:0a.0'
- vnfd-connection-point-ref: eth0
+ external-connection-point-ref: eth0
EOF
# Add external interfaces
@@ -241,11 +242,12 @@
pci=$(get_pci $eth)
cat >>$desc_file <<EOF
- name: eth${eth}
+ type: EXTERNAL
virtual-interface:
type: ${INTF_TYPE}
bandwidth: '0'
vpci: '0000:00:${pci}.0'
- vnfd-connection-point-ref: eth${eth}
+ external-connection-point-ref: eth${eth}
EOF
done
diff --git a/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml b/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
index 0ac926f..4398ff0 100644
--- a/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
+++ b/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
@@ -8,9 +8,6 @@
mgmt-interface:
vdu-id: VyOS-VM
vnf-configuration:
- config-attributes:
- config-delay: '0'
- config-priority: '1'
service-primitive:
- name: config
parameter:
@@ -62,37 +59,42 @@
storage-gb: '40'
vcpu-count: '1'
mgmt-vpci: 0000:00:0a.0
- external-interface:
+ interface:
- name: eth0
+ type: EXTERNAL
virtual-interface:
bandwidth: '0'
type: OM-MGMT
vpci: 0000:00:0a.0
- vnfd-connection-point-ref: eth0
+ external-connection-point-ref: eth0
- name: eth1
+ type: EXTERNAL
virtual-interface:
bandwidth: '0'
type: VIRTIO
vpci: 0000:00:0b.0
- vnfd-connection-point-ref: eth1
+ external-connection-point-ref: eth1
- name: eth2
+ type: EXTERNAL
virtual-interface:
bandwidth: '0'
type: VIRTIO
vpci: 0000:00:0c.0
- vnfd-connection-point-ref: eth2
+ external-connection-point-ref: eth2
- name: eth3
+ type: EXTERNAL
virtual-interface:
bandwidth: '0'
type: VIRTIO
vpci: 0000:00:0d.0
- vnfd-connection-point-ref: eth3
+ external-connection-point-ref: eth3
- name: eth4
+ type: EXTERNAL
virtual-interface:
bandwidth: '0'
type: VIRTIO
vpci: 0000:00:0e.0
- vnfd-connection-point-ref: eth4
+ external-connection-point-ref: eth4
guest-epa:
cpu-pinning-policy: DEDICATED
cpu-thread-pinning-policy: PREFER
diff --git a/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml b/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
index e643b38..47f8d27 100644
--- a/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
+++ b/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
@@ -32,15 +32,16 @@
image: 'CirrOS 0.3.4 64-bit'
#checksum:
- external-interface:
+ interface:
# Specify the external interfaces
# There can be multiple interfaces defined
- name: eth0
+ type: EXTERNAL
virtual-interface:
type: OM-MGMT
bandwidth: '0'
vpci: 0000:00:0a.0
- vnfd-connection-point-ref: eth0
+ external-connection-point-ref: eth0
connection-point:
- name: eth0
diff --git a/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml b/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
index b73e110..9e0cd92 100644
--- a/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
+++ b/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
@@ -8,9 +8,6 @@
mgmt-interface:
vdu-id: IMS-ALLIN1_2p-VM
vnf-configuration:
- config-attributes:
- config-delay: '0'
- config-priority: '1'
service-primitive:
- name: config
parameter:
@@ -58,19 +55,21 @@
storage-gb: '10'
vcpu-count: '2'
mgmt-vpci: 0000:00:0a.0
- external-interface:
+ interface:
- name: eth0
+ type: EXTERNAL
virtual-interface:
bandwidth: '0'
type: VIRTIO
vpci: 0000:00:0a.0
- vnfd-connection-point-ref: eth0
+ external-connection-point-ref: eth0
- name: eth1
+ type: EXTERNAL
virtual-interface:
bandwidth: '0'
type: OM-MGMT
vpci: 0000:00:0b.0
- vnfd-connection-point-ref: eth1
+ external-connection-point-ref: eth1
guest-epa:
cpu-pinning-policy: DEDICATED
cpu-thread-pinning-policy: PREFER
diff --git a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
index 60f00cf..8c7773f 100644
--- a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
+++ b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
@@ -48,15 +48,17 @@
vdu:
- cloud-init-file: ping_cloud_init.cfg
count: '1'
- external-interface:
+ interface:
- name: eth0
+ type: EXTERNAL
virtual-interface:
type: VIRTIO
- vnfd-connection-point-ref: ping_vnfd/cp0
+ external-connection-point-ref: ping_vnfd/cp0
- name: eth1
+ type: EXTERNAL
virtual-interface:
type: VIRTIO
- vnfd-connection-point-ref: ping_vnfd/cp1
+ external-connection-point-ref: ping_vnfd/cp1
id: iovdu_0
image: Fedora-x86_64-20-20131211.1-sda-ping.qcow2
name: iovdu_0
@@ -65,8 +67,6 @@
storage-gb: '4'
vcpu-count: '1'
vnf-configuration:
- config-attributes:
- config-delay: 10
service-primitive:
- name: start
- name: stop
diff --git a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
index b6bc9a1..835f324 100644
--- a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
+++ b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
@@ -48,15 +48,17 @@
vdu:
- cloud-init-file: pong_cloud_init.cfg
count: '1'
- external-interface:
+ interface:
- name: eth0
+ type: EXTERNAL
virtual-interface:
type: VIRTIO
- vnfd-connection-point-ref: pong_vnfd/cp0
+ external-connection-point-ref: pong_vnfd/cp0
- name: eth1
+ type: EXTERNAL
virtual-interface:
type: VIRTIO
- vnfd-connection-point-ref: pong_vnfd/cp1
+ external-connection-point-ref: pong_vnfd/cp1
id: iovdu_0
image: Fedora-x86_64-20-20131211.1-sda-pong.qcow2
name: iovdu_0
@@ -65,8 +67,6 @@
storage-gb: '4'
vcpu-count: '1'
vnf-configuration:
- config-attributes:
- config-delay: 10
service-primitive:
- name: start
- name: stop
diff --git a/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml b/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
index f308282..dc207f9 100644
--- a/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
@@ -20,16 +20,17 @@
- id-ref: 'iface11'
- id-ref: 'iface21'
vdu:
- - external-interface:
+ - interface:
- name: iface10
+ type: EXTERNAL
virtual-interface:
type: OM-MGMT
- vnfd-connection-point-ref: mgmt0
- internal-interface:
+ external-connection-point-ref: mgmt0
- name: iface11
+ type: INTERNAL
virtual-interface:
type: VIRTIO
- vdu-internal-connection-point-ref: iface11
+ internal-connection-point-ref: iface11
internal-connection-point:
- name: iface11
id: iface11
@@ -41,16 +42,17 @@
memory-mb: '2048'
storage-gb: '8'
vcpu-count: '2'
- - external-interface:
+ - interface:
- name: iface22
+ type: EXTERNAL
virtual-interface:
type: VIRTIO
- vnfd-connection-point-ref: west
- internal-interface:
+ external-connection-point-ref: west
- name: iface21
+ type: INTERNAL
virtual-interface:
type: VIRTIO
- vdu-internal-connection-point-ref: iface21
+ internal-connection-point-ref: iface21
internal-connection-point:
- name: iface21
id: iface21
diff --git a/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml b/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
index 2901c4a..8602895 100644
--- a/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
@@ -23,11 +23,17 @@
- id-ref: 'iface41'
vdu:
- description: Middlepoint
- external-interface:
+ interface:
- name: iface30
+ type: EXTERNAL
virtual-interface:
type: OM-MGMT
- vnfd-connection-point-ref: mgmt0
+ external-connection-point-ref: mgmt0
+ - name: iface31
+ type: INTERNAL
+ internal-connection-point-ref: iface31
+ virtual-interface:
+ type: VIRTIO
guest-epa:
cpu-pinning-policy: DEDICATED
mempage-size: "LARGE"
@@ -37,25 +43,27 @@
- id: iface31
name: iface31
type: VPORT
- internal-interface:
- - name: iface31
- vdu-internal-connection-point-ref: iface31
- virtual-interface:
- type: VIRTIO
name: Ref_VM3
vm-flavor:
memory-mb: '2048'
storage-gb: '8'
vcpu-count: '2'
- - external-interface:
+ - interface:
- name: iface42
+ type: EXTERNAL
virtual-interface:
type: PCI-PASSTHROUGH
- vnfd-connection-point-ref: west
+ external-connection-point-ref: west
- name: iface43
+ type: EXTERNAL
virtual-interface:
type: SR-IOV
- vnfd-connection-point-ref: east
+ external-connection-point-ref: east
+ - name: iface41
+ type: INTERNAL
+ internal-connection-point-ref: iface41
+ virtual-interface:
+ type: VIRTIO
guest-epa:
cpu-pinning-policy: DEDICATED
id: e526e
@@ -64,10 +72,5 @@
name: iface41
type: VPORT
name: Ref_VM4
- internal-interface:
- - name: iface41
- vdu-internal-connection-point-ref: iface41
- virtual-interface:
- type: VIRTIO
vendor: ETSI
version: '1.0'
diff --git a/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml b/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
index 390ab9d..3d25e94 100644
--- a/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
@@ -10,15 +10,17 @@
name: Ref_Vnf_21
short-name: Ref_Vnf_21
vdu:
- - external-interface:
+ - interface:
- name: iface50
+ type: EXTERNAL
virtual-interface:
type: OM-MGMT
- vnfd-connection-point-ref: mgmt
+ external-connection-point-ref: mgmt
- name: iface51
+ type: EXTERNAL
virtual-interface:
type: VIRTIO
- vnfd-connection-point-ref: data
+ external-connection-point-ref: data
id: ref_vm21
image: ref_vm21.qcow2
name: Ref_VM_5
diff --git a/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml b/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
index 7dddc6f..2b1806d 100644
--- a/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
@@ -12,19 +12,22 @@
name: Ref_VNF_22
short-name: Ref_VNF_22
vdu:
- - external-interface:
+ - interface:
- name: iface60
+ type: EXTERNAL
virtual-interface:
type: OM-MGMT
- vnfd-connection-point-ref: mgmt
+ external-connection-point-ref: mgmt
- name: iface61
+ type: EXTERNAL
virtual-interface:
type: PCI-PASSTHROUGH
- vnfd-connection-point-ref: west
+ external-connection-point-ref: west
- name: iface62
+ type: EXTERNAL
virtual-interface:
type: SR-IOV
- vnfd-connection-point-ref: east
+ external-connection-point-ref: east
id: abd6831e-f811-4580-9aad-1de9c6424180
image: ref_vm22.qcow2
name: Ref_VM6
diff --git a/descriptor-packages/vnfd/ubuntu_cirros_multidisk_vnf/src/ubuntu_cirros_multidisk_vnfd.yaml b/descriptor-packages/vnfd/ubuntu_cirros_multidisk_vnf/src/ubuntu_cirros_multidisk_vnfd.yaml
index da037b1..12d56fd 100644
--- a/descriptor-packages/vnfd/ubuntu_cirros_multidisk_vnf/src/ubuntu_cirros_multidisk_vnfd.yaml
+++ b/descriptor-packages/vnfd/ubuntu_cirros_multidisk_vnf/src/ubuntu_cirros_multidisk_vnfd.yaml
@@ -27,13 +27,14 @@
# User-data injection
cloud-init-file: cloud_init.cfg
- external-interface:
+ interface:
# Specify the external interfaces
# There can be multiple interfaces defined
- name: eth0
+ type: EXTERNAL
virtual-interface:
type: OM-MGMT
- vnfd-connection-point-ref: eth0
+ external-connection-point-ref: eth0
# Specify the volume
# There can be multiple interfaces defined
volumes:
diff --git a/descriptor-packages/vnfd/ubuntu_xenial_vnf/src/ubuntu_xenial_vnfd.yaml b/descriptor-packages/vnfd/ubuntu_xenial_vnf/src/ubuntu_xenial_vnfd.yaml
index ee6a3ac..846ccc8 100644
--- a/descriptor-packages/vnfd/ubuntu_xenial_vnf/src/ubuntu_xenial_vnfd.yaml
+++ b/descriptor-packages/vnfd/ubuntu_xenial_vnf/src/ubuntu_xenial_vnfd.yaml
@@ -33,15 +33,16 @@
# User-data injection
cloud-init-file: cloud_init.cfg
- external-interface:
+ interface:
# Specify the external interfaces
# There can be multiple interfaces defined
- name: eth0
+ type: EXTERNAL
virtual-interface:
type: OM-MGMT
bandwidth: '0'
vpci: 0000:00:0a.0
- vnfd-connection-point-ref: eth0
+ external-connection-point-ref: eth0
connection-point:
- name: eth0