From f9f2aedad5eb1e72c41bedc335038b93e5c97752 Mon Sep 17 00:00:00 2001 From: bravof Date: Fri, 4 Sep 2020 12:44:43 -0400 Subject: [PATCH] fix(merge): merge with previous magma vnf descriptor --- .../magma-agw-enb_vnfd.yaml | 543 +++++++++--------- 1 file changed, 277 insertions(+), 266 deletions(-) diff --git a/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml b/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml index 1f5e2402..0cc5e2e3 100644 --- a/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml +++ b/magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml @@ -1,267 +1,278 @@ vnfd-catalog: - vnfd: - - id: hackfest_magma-agw-enb_vnfd - name: hackfest_magma-agw-enb_vnfd - short-name: hackfest_magma-agw-enb_vnfd - description: Magma AGW v1.0.0 with tools & srsLTE VDU - vendor: Whitestack - version: '1.0' - mgmt-interface: - cp: agw-mgmt - vdu: - - id: magma-agw-vdu - name: magma-agw-vdu - description: magma-agw-vdu - count: 1 - cloud-init-file: magmaagw_init - vm-flavor: - vcpu-count: 1 - memory-mb: 4096 - storage-gb: 50 - image: 'magma101_hfmr9' - interface: - - name: eth0 - type: INTERNAL - position: 1 - virtual-interface: - #type: SR-IOV - type: PARAVIRT - internal-connection-point-ref: agw-s1 - - name: eth1 - type: EXTERNAL - position: 2 - virtual-interface: - type: PARAVIRT - external-connection-point-ref: agw-sgi - - name: eth2 - type: EXTERNAL - position: 3 - virtual-interface: - type: PARAVIRT - external-connection-point-ref: agw-mgmt - internal-connection-point: - - id: agw-s1 - name: agw-s1 - short-name: agw-s1 - port-security-enabled: false - vdu-configuration: - juju: - charm: magmagw - config-access: - ssh-access: - required: true - initial-config-primitive: - - seq: 1 - name: config - parameter: - - name: ssh-hostname - value: - - name: ssh-username - value: magma - - name: ssh-password - value: magma - - seq: 2 - name: reset-id - - seq: 3 - name: add-net - parameter: - - name: orch_ip - value: - - name: orch_net - value: - - seq: 4 - name: add-gw - parameter: - - name: agw_id - value: - - name: agw_name - value: - - name: orch_ip - value: - - name: orch_net - value: - - seq: 5 - name: add-test-subscriber - parameter: - - name: orch_ip - value: - - name: orch_net - value: - - seq: 6 - name: add-hosts - parameter: - - name: orch_ip - value: - - seq: 7 - name: restart-magma - config-primitive: - - name: add-gw - parameter: - - name: agw_id - default-value: - - name: agw_name - default-value: - - name: orch_ip - default-value: - - name: orch_net - default-value: - - name: del-gw - parameter: - - name: agw_id - default-value: - - name: orch_ip - default-value: - - name: orch_net - default-value: - - name: reset-id - - name: restart-magma - - monitoring-param: - - id: agw_cpu_util - nfvi-metric: cpu_utilization - - id: agw_memory_util - nfvi-metric: average_memory_utilization - - id: agw_packets_received - nfvi-metric: packets_received - - id: agw_packets_sent - nfvi-metric: packets_sent - alarm: - - actions: - alarm: - - url: https://webhook.site/5706da10-04a0-4ab0-819b-cb524f71a367 - alarm-id: cpu-above-threshold - operation: GT - value: 80 - vnf-monitoring-param-ref: agw_cpu_util - - id: srsLTE-vdu - name: srsLTE-vdu - description: srsLTE-vdu - count: 1 - cloud-init-file: srslte_init - vm-flavor: - vcpu-count: 4 - memory-mb: 6144 - storage-gb: 100 - image: 'srsLTEzmqRF_hf9' - interface: - - name: eth0 - type: EXTERNAL - virtual-interface: - type: PARAVIRT - external-connection-point-ref: srsLTE-mgmt - mgmt-interface: true - - name: eth1 - type: INTERNAL - virtual-interface: - #type: SR-IOV - type: PARAVIRT - internal-connection-point-ref: srsLTE-s1 - internal-connection-point: - - id: srsLTE-s1 - name: srsLTE-s1 - short-name: srsLTE-s1 - vdu-configuration: - juju: - charm: enodeb - proxy: False - config-access: - ssh-access: - required: True - default-user: ubuntu - initial-config-primitive: - - seq: 1 - name: remove-default-gw - config-primitive: - - name: register - parameter: - - name: mme-addr - data-type: STRING - - name: gtp-bind-addr - data-type: STRING - - name: s1c-bind-addr - data-type: STRING - - name: attach-ue - parameter: - - name: usim-imsi - data-type: STRING - - name: usim-k - data-type: STRING - - name: usim-opc - data-type: STRING - - name: unregister - - name: detach-ue - internal-vld: - - id: internalS1 - name: internalS1 - short-name: internalS1 - type: ELAN - ip-profile-ref: internalS1 - internal-connection-point: - - id-ref: agw-s1 - ip-address: 192.168.100.254 - - id-ref: srsLTE-s1 - ip-address: 192.168.100.10 - ip-profiles: - - name: internalS1 - description: S1 test network - ip-profile-params: - ip-version: ipv4 - subnet-address: 192.168.100.0/24 - dhcp-params: - enabled: true - connection-point: - - name: agw-mgmt - - name: agw-sgi - - name: srsLTE-mgmt - vnf-configuration: - relation: - - name: agw - entities: - - id: srsLTE-vdu - endpoint: agw - - id: magma-agw-vdu - endpoint: agw - monitoring-param: - - id: agw_cpu_util - name: agw_cpu_util - aggregation-type: AVERAGE - vdu-monitoring-param: - vdu-ref: magma-agw-vdu - vdu-monitoring-param-ref: agw_cpu_util - - id: agw_memory_util - name: agw_memory_util - aggregation-type: AVERAGE - vdu-monitoring-param: - vdu-ref: magma-agw-vdu - vdu-monitoring-param-ref: agw_memory_util - - id: agw_packets_received - name: agw_packets_received - aggregation-type: AVERAGE - vdu-monitoring-param: - vdu-ref: magma-agw-vdu - vdu-monitoring-param-ref: agw_packets_received - - id: agw_packets_sent - name: agw_packets_sent - aggregation-type: AVERAGE - vdu-monitoring-param: - vdu-ref: magma-agw-vdu - vdu-monitoring-param-ref: agw_packets_sent - scaling-group-descriptor: - - max-instance-count: 1 - min-instance-count: 0 - name: vdu_autoscale - scaling-policy: - - cooldown-time: 120 - name: cpu_util_above_threshold - scaling-criteria: - - name: cpu_util_above_threshold - scale-in-relational-operation: LT - scale-in-threshold: 10 - scale-out-relational-operation: GT - scale-out-threshold: 60 - vnf-monitoring-param-ref: agw_cpu_util - scaling-type: automatic - threshold-time: 10 - vdu: - - count: 1 - vdu-id-ref: magma-agw-vdu + vnfd: + - id: hackfest_magma-agw-enb_vnfd + name: hackfest_magma-agw-enb_vnfd + short-name: hackfest_magma-agw-enb_vnfd + description: Magma AGW v1.0.0 with tools & srsLTE VDU + vendor: Whitestack + version: "1.0" + mgmt-interface: + cp: agw-mgmt + vdu: + - id: magma-agw-vdu + name: magma-agw-vdu + description: magma-agw-vdu + count: 1 + cloud-init-file: magmaagw_init + vm-flavor: + vcpu-count: 1 + memory-mb: 4096 + storage-gb: 50 + image: "magma101_hfmr9" + interface: + - name: eth0 + type: INTERNAL + position: 1 + virtual-interface: + #type: SR-IOV + type: PARAVIRT + internal-connection-point-ref: agw-s1 + - name: eth1 + type: EXTERNAL + position: 2 + virtual-interface: + type: PARAVIRT + external-connection-point-ref: agw-sgi + - name: eth2 + type: EXTERNAL + position: 3 + virtual-interface: + type: PARAVIRT + external-connection-point-ref: agw-mgmt + internal-connection-point: + - id: agw-s1 + name: agw-s1 + short-name: agw-s1 + port-security-enabled: false + vdu-configuration: + juju: + charm: magmagw + config-access: + ssh-access: + required: true + initial-config-primitive: + - seq: 1 + name: config + parameter: + - name: ssh-hostname + value: + - name: ssh-username + value: magma + - name: ssh-password + value: magma + - seq: 2 + name: reset-id + - seq: 3 + name: add-net + parameter: + - name: orch_ip + value: + - name: orch_net + value: + - seq: 4 + name: add-gw + parameter: + - name: agw_id + value: + - name: agw_name + value: + - name: orch_ip + value: + - name: orch_net + value: + - seq: 5 + name: add-test-subscriber + parameter: + - name: orch_ip + value: + - name: orch_net + value: + - seq: 6 + name: add-hosts + parameter: + - name: orch_ip + value: + - seq: 7 + name: restart-magma + config-primitive: + - name: add-gw + parameter: + - name: agw_id + default-value: + - name: agw_name + default-value: + - name: orch_ip + default-value: + - name: orch_net + default-value: + - name: del-gw + parameter: + - name: agw_id + default-value: + - name: orch_ip + default-value: + - name: orch_net + default-value: + - name: reset-id + - name: restart-magma + monitoring-param: + - id: agw_cpu_util + nfvi-metric: cpu_utilization + - id: agw_memory_util + nfvi-metric: average_memory_utilization + - id: agw_packets_received + nfvi-metric: packets_received + - id: agw_packets_sent + nfvi-metric: packets_sent + alarm: + - actions: + alarm: + - url: https://webhook.site/5706da10-04a0-4ab0-819b-cb524f71a367 + alarm-id: cpu-above-threshold + operation: GT + value: 80 + vnf-monitoring-param-ref: agw_cpu_util + - id: srsLTE-vdu + name: srsLTE-vdu + description: srsLTE-vdu + count: 1 + cloud-init-file: srslte_init + vm-flavor: + vcpu-count: 4 + memory-mb: 6144 + storage-gb: 100 + image: "srsLTEzmqRF_hf9" + interface: + - name: eth0 + type: EXTERNAL + virtual-interface: + type: PARAVIRT + external-connection-point-ref: srsLTE-mgmt + mgmt-interface: true + - name: eth1 + type: INTERNAL + virtual-interface: + #type: SR-IOV + type: PARAVIRT + internal-connection-point-ref: srsLTE-s1 + internal-connection-point: + - id: srsLTE-s1 + name: srsLTE-s1 + short-name: srsLTE-s1 + vdu-configuration: + juju: + charm: enodeb + proxy: False + config-access: + ssh-access: + required: True + default-user: ubuntu + initial-config-primitive: + - seq: 1 + name: remove-default-gw + config-primitive: + - name: register + parameter: + - name: mme-addr + data-type: STRING + - name: gtp-bind-addr + data-type: STRING + - name: s1c-bind-addr + data-type: STRING + - name: attach-ue + parameter: + - name: usim-imsi + data-type: STRING + - name: usim-k + data-type: STRING + - name: usim-opc + data-type: STRING + - name: unregister + - name: detach-ue + internal-vld: + - id: internalS1 + name: internalS1 + short-name: internalS1 + type: ELAN + ip-profile-ref: internalS1 + internal-connection-point: + - id-ref: agw-s1 + ip-address: 192.168.100.254 + - id-ref: srsLTE-s1 + ip-address: 192.168.100.10 + ip-profiles: + - name: internalS1 + description: S1 test network + ip-profile-params: + ip-version: ipv4 + subnet-address: 192.168.100.0/24 + dhcp-params: + enabled: true + connection-point: + - name: agw-mgmt + - name: agw-sgi + - name: srsLTE-mgmt + vnf-configuration: + execution-environment-list: + - id: monitor + helm-chart: eechart + metric-service: snmpexporter + connection-point-ref: agw-mgmt + initial-config-primitive: + - seq: 1 + name: generate_snmp + execution-environment-ref: monitor + config-primitive: + - name: generate_snmp + execution-environment-ref: monitor + relation: + - name: agw + entities: + - id: srsLTE-vdu + endpoint: agw + - id: magma-agw-vdu + endpoint: agw + monitoring-param: + - id: agw_cpu_util + name: agw_cpu_util + aggregation-type: AVERAGE + vdu-monitoring-param: + vdu-ref: magma-agw-vdu + vdu-monitoring-param-ref: agw_cpu_util + - id: agw_memory_util + name: agw_memory_util + aggregation-type: AVERAGE + vdu-monitoring-param: + vdu-ref: magma-agw-vdu + vdu-monitoring-param-ref: agw_memory_util + - id: agw_packets_received + name: agw_packets_received + aggregation-type: AVERAGE + vdu-monitoring-param: + vdu-ref: magma-agw-vdu + vdu-monitoring-param-ref: agw_packets_received + - id: agw_packets_sent + name: agw_packets_sent + aggregation-type: AVERAGE + vdu-monitoring-param: + vdu-ref: magma-agw-vdu + vdu-monitoring-param-ref: agw_packets_sent + scaling-group-descriptor: + - max-instance-count: 1 + min-instance-count: 0 + name: vdu_autoscale + scaling-policy: + - cooldown-time: 120 + name: cpu_util_above_threshold + scaling-criteria: + - name: cpu_util_above_threshold + scale-in-relational-operation: LT + scale-in-threshold: 10 + scale-out-relational-operation: GT + scale-out-threshold: 60 + vnf-monitoring-param-ref: agw_cpu_util + scaling-type: automatic + threshold-time: 10 + vdu: + - count: 1 + vdu-id-ref: magma-agw-vdu -- GitLab