X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=tests%2Fexamples%2Fvepc_sol006.yaml;h=4137873534863815da8d04e1a3da01ac9939a978;hp=b4e43c24fc9864315b9d0e099efd76cd6df840c8;hb=refs%2Ftags%2Frelease-v10.0-start;hpb=76f6a62b4cc15bc77cf1270d2b1630524fb2879f diff --git a/tests/examples/vepc_sol006.yaml b/tests/examples/vepc_sol006.yaml index b4e43c2..4137873 100644 --- a/tests/examples/vepc_sol006.yaml +++ b/tests/examples/vepc_sol006.yaml @@ -25,12 +25,12 @@ vnfd: virtual-cpu: num-virtual-cpu: 2 virtual-memory: - size: 4 # Memory size in GB + size: 4.0 # Memory size in GB - id: hss-compute virtual-cpu: num-virtual-cpu: 1 virtual-memory: - size: 2 # Memory size in GB + size: 2.0 # Memory size in GB virtual-storage-desc: - id: spgwmme-storage size-of-storage: 10 @@ -39,12 +39,11 @@ vnfd: sw-image-desc: - id: nextepc-spgwmme-base name: nextepc-spgwmme-base - checksum: - hash: # Mandatory? - - id: nextepc-hss-bas - name: nextepc-hss-bas - checksum: - hash: # Mandatory? + image: nextepc-spgwmme-base + - id: nextepc-hss-base + name: nextepc-hss-base + image: nextepc-hss-base + vdu: - id: spgwmme name: spgwmme @@ -55,27 +54,34 @@ vnfd: - spgwmme-storage sw-image-desc: nextepc-spgwmme-base int-cpd: - - id: spgwmme-mgmt-int + - id: eth0-int virtual-network-interface-requirement: - name: eth0 virtual-interface: type: PARAVIRT - - id: spgwmme-s1-int + - id: eth1-int virtual-network-interface-requirement: - name: eth1 virtual-interface: type: PARAVIRT - - id: spgwmme-sgi-int + - id: eth2-int virtual-network-interface-requirement: - name: eth2 virtual-interface: type: PARAVIRT - - id: spgwmme-s6a-int + - id: eth3-int int-virtual-link-desc: s6a # Connection to VLD! virtual-network-interface-requirement: - name: eth3 virtual-interface: type: PARAVIRT + monitoring-parameter: + - id: "spgw_cpu_util" + name: "spgw_cpu_util" + performance-metric: "cpu_utilization" + - id: "spgw_memory_util" + name: "spgw_memory_util" + performance-metric: "average_memory_utilization" - id: hss name: hss description: hss @@ -83,30 +89,28 @@ vnfd: virtual-compute-desc: hss-compute virtual-storage-desc: - hss-storage - sw-image-desc: nextepc-hss-bas + sw-image-desc: nextepc-hss-base int-cpd: - - id: hss-mgmt-int + - id: eth0-int virtual-network-interface-requirement: - name: eth0 virtual-interface: type: PARAVIRT - - id: hss-s6a-int + - id: eth1-int int-virtual-link-desc: s6a # Connection to VLD! virtual-network-interface-requirement: - name: eth1 virtual-interface: type: PARAVIRT df: - - id: vepc_default - vnf-configuration-id: vnf-configuration-example + - id: default-df vdu-profile: - id: spgwmme min-number-of-instances: 1 - id: hss min-number-of-instances: 1 - vdu-configuration-id: vdu-configuration-example instantiation-level: - - id: default + - id: default-instantiation-level vdu-level: - vdu-id: spgwmme number-of-instances: 1 @@ -114,88 +118,85 @@ vnfd: number-of-instances: 1 virtual-link-profile: - id: s6a - flavour: + flavour: "" virtual-link-protocol-data: l3-protocol-data: - name: s6a + name: s6a-l3-protocol-data description: s6a network ip-version: ipv4 cidr: 10.0.6.0/24 dhcp-enabled: true - monitoring-parameter: - - id: "spgw_cpu_util" - name: "spgw_cpu_util" - performance-metric: "cpu_load" - collection-period: 123456 - #aggregation-type: AVERAGE # Not included in augments - #vdu-monitoring-param: # Not included in augments - # vdu-ref: "spgwmme" # Not included in augments - # vdu-monitoring-param-ref: "spgw_cpu_util" # Not included in augments - - id: "spgw_memory_util" - name: "spgw_memory_util" - #aggregation-type: AVERAGE # Not included in augments - #vdu-monitoring-param: # Not included in augments - # vdu-ref: "spgwmme" # Not included in augments - # vdu-monitoring-param-ref: "spgw_memory_util" # Not included in augments - vdu-configuration: - - id: vdu-configuration-example - initial-config-primitive: - - seq: "1" - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - - name: ssh-password - value: - - seq: "2" - name: configure-hss - parameter: - - name: spgw-ip - data-type: STRING - value: - - name: hss-ip - data-type: STRING - value: - - seq: "3" - name: restart-hss - juju: - charm: hsscharm - vnf-configuration: - - id: vnf-configuration-example - initial-config-primitive: - - seq: "1" - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: ubuntu - - name: ssh-password - value: - - seq: "2" - name: configure-spgw - parameter: - - name: spgw-ip - data-type: STRING - value: - - name: hss-ip - data-type: STRING - value: - - 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 + execution-environment-list: + - id: spgwcharm-ee + juju: + charm: spgwcharm + initial-config-primitive: + - seq: "1" + name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: + execution-environment-ref: spgwcharm-ee + - seq: "2" + name: configure-spgw + parameter: + - name: spgw-ip + data-type: STRING + value: + - name: hss-ip + data-type: STRING + value: + execution-environment-ref: spgwcharm-ee + - seq: "3" + name: restart-spgw + execution-environment-ref: spgwcharm-ee + 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" + execution-environment-ref: spgwcharm-ee + - id: hss + execution-environment-list: + - id: hsscharm-ee + juju: + charm: hsscharm + initial-config-primitive: + - seq: "1" + execution-environment-ref: hsscharm-ee + name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: ubuntu + - name: ssh-password + value: + - seq: "2" + name: configure-hss + parameter: + - name: spgw-ip + data-type: STRING + value: + - name: hss-ip + data-type: STRING + value: + execution-environment-ref: hsscharm-ee + - seq: "3" + name: restart-hss + execution-environment-ref: hsscharm-ee int-virtual-link-desc: - id: s6a ext-cpd: @@ -203,17 +204,17 @@ vnfd: - id: spgwmme-mgmt-ext int-cpd: # Connection to int-cpd vdu-id: spgwmme - cpd: spgwmme-mgmt-int + cpd: eth0-int - id: spgwmme-s1-ext int-cpd: # Connection to int-cpd vdu-id: spgwmme - cpd: spgwmme-mgmt-int + cpd: eth1-int - id: spgwmme-sgi-ext int-cpd: # Connection to int-cpd vdu-id: spgwmme - cpd: spgwmme-mgmt-int + cpd: eth2-int # HSS - id: hss-mgmt-ext int-cpd: # Connection to int-cpd - vdu-id: spgwmme - cpd: spgwmme-mgmt-int + vdu-id: hss + cpd: eth0-int