feat(configurations): now VNF/VDU/KDU configurations are in the same place, compatible with SOL006
Change-Id: Ia2d03e26987b7c319373005d7afed7d42ec54e3a
Signed-off-by: bravof <fbravo@whitestack.com>
diff --git a/tests/examples/hackfest_charmed_vnfd_sol006.yaml b/tests/examples/hackfest_charmed_vnfd_sol006.yaml
index 069198b..ab55af8 100644
--- a/tests/examples/hackfest_charmed_vnfd_sol006.yaml
+++ b/tests/examples/hackfest_charmed_vnfd_sol006.yaml
@@ -107,7 +107,6 @@
df:
- id: default-df
- vnf-configuration-id: default-vnf-configuration
vdu-profile:
- id: mgmtVM
min-number-of-instances: 1
@@ -149,29 +148,30 @@
vnf-config-primitive-name-ref: touch
- trigger: pre-scale-in
vnf-config-primitive-name-ref: touch
-
- vnf-configuration:
- - id: default-vnf-configuration
- initial-config-primitive:
- - seq: "1"
- name: config
- parameter:
- - name: ssh-hostname
- value: <rw_mgmt_ip>
- - name: ssh-username
- value: ubuntu
- - name: ssh-password
- value: osm4u
- - seq: "2"
- name: touch
- parameter:
- - name: filename
- value: <touch_filename>
- config-primitive:
- - name: touch
- parameter:
- - data-type: STRING
- default-value: <touch_filename2>
- name: filename
- juju:
- charm: simple
+ lcm-operations-configuration:
+ operate-vnf-op-config:
+ day1-2:
+ - id: hackfest3charmed-vnf
+ initial-config-primitive:
+ - seq: "1"
+ name: config
+ parameter:
+ - name: ssh-hostname
+ value: <rw_mgmt_ip>
+ - name: ssh-username
+ value: ubuntu
+ - name: ssh-password
+ value: osm4u
+ - seq: "2"
+ name: touch
+ parameter:
+ - name: filename
+ value: <touch_filename>
+ config-primitive:
+ - name: touch
+ parameter:
+ - data-type: STRING
+ default-value: <touch_filename2>
+ name: filename
+ juju:
+ charm: simple
\ No newline at end of file
diff --git a/tests/examples/vepc_sol006.yaml b/tests/examples/vepc_sol006.yaml
index e5863e7..f248efd 100644
--- a/tests/examples/vepc_sol006.yaml
+++ b/tests/examples/vepc_sol006.yaml
@@ -104,13 +104,11 @@
type: PARAVIRT
df:
- id: default-df
- vnf-configuration-id: default-vnf-configuration
vdu-profile:
- id: spgwmme
min-number-of-instances: 1
- id: hss
min-number-of-instances: 1
- vdu-configuration-id: hss-vdu-configuration
instantiation-level:
- id: default-instantiation-level
vdu-level:
@@ -128,65 +126,66 @@
ip-version: ipv4
cidr: 10.0.6.0/24
dhcp-enabled: true
- vdu-configuration:
- - id: hss-vdu-configuration
- initial-config-primitive:
- - seq: "1"
- name: config
- parameter:
- - name: ssh-hostname
- value: <rw_mgmt_ip>
- - name: ssh-username
- value: ubuntu
- - name: ssh-password
- value: <password>
- - seq: "2"
- name: configure-hss
- parameter:
- - name: spgw-ip
- data-type: STRING
- value: <spgw_ip>
- - name: hss-ip
- data-type: STRING
- value: <hss_ip>
- - seq: "3"
- name: restart-hss
- juju:
- charm: hsscharm
- vnf-configuration:
- - id: default-vnf-configuration
- initial-config-primitive:
- - seq: "1"
- name: config
- parameter:
- - name: ssh-hostname
- value: <rw_mgmt_ip>
- - name: ssh-username
- value: ubuntu
- - name: ssh-password
- value: <password>
- - seq: "2"
- name: configure-spgw
- parameter:
- - name: spgw-ip
- data-type: STRING
- value: <spgw_ip>
- - name: hss-ip
- data-type: STRING
- value: <hss_ip>
- - seq: "3"
- name: restart-spgw
- config-primitive:
- - name: add-route
- parameter:
- - name: external-prefix
- data-type: STRING
- default-value: "8.8.8.8/32"
- - name: next-hop
- data-type: STRING
- default-value: "192.168.2.1"
- juju:
- charm: spgwcharm
+ lcm-operations-configuration:
+ operate-vnf-op-config:
+ day1-2:
+ - id: vEPC_vnfd
+ initial-config-primitive:
+ - seq: "1"
+ name: config
+ parameter:
+ - name: ssh-hostname
+ value: <rw_mgmt_ip>
+ - name: ssh-username
+ value: ubuntu
+ - name: ssh-password
+ value: <password>
+ - seq: "2"
+ name: configure-spgw
+ parameter:
+ - name: spgw-ip
+ data-type: STRING
+ value: <spgw_ip>
+ - name: hss-ip
+ data-type: STRING
+ value: <hss_ip>
+ - seq: "3"
+ name: restart-spgw
+ config-primitive:
+ - name: add-route
+ parameter:
+ - name: external-prefix
+ data-type: STRING
+ default-value: "8.8.8.8/32"
+ - name: next-hop
+ data-type: STRING
+ default-value: "192.168.2.1"
+ juju:
+ charm: spgwcharm
+ - id: hss
+ initial-config-primitive:
+ - seq: "1"
+ name: config
+ parameter:
+ - name: ssh-hostname
+ value: <rw_mgmt_ip>
+ - name: ssh-username
+ value: ubuntu
+ - name: ssh-password
+ value: <password>
+ - seq: "2"
+ name: configure-hss
+ parameter:
+ - name: spgw-ip
+ data-type: STRING
+ value: <spgw_ip>
+ - name: hss-ip
+ data-type: STRING
+ value: <hss_ip>
+ - seq: "3"
+ name: restart-hss
+ juju:
+ charm: hsscharm
int-virtual-link-desc:
- id: s6a
ext-cpd: