Commit 24669309 authored by lavado's avatar lavado
Browse files

Merge branch 'feat/magma_snmp' into 'master'

fix(merge): merge with previous magma vnf descriptor

See merge request !85
parents c1bb72b2 f9f2aeda
Loading
Loading
Loading
Loading
+277 −266
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ vnfd-catalog:
      short-name: hackfest_magma-agw-enb_vnfd
      description: Magma AGW v1.0.0 with tools & srsLTE VDU
      vendor: Whitestack
        version: '1.0'
      version: "1.0"
      mgmt-interface:
        cp: agw-mgmt
      vdu:
@@ -18,7 +18,7 @@ vnfd-catalog:
            vcpu-count: 1
            memory-mb: 4096
            storage-gb: 50
            image: 'magma101_hfmr9'
          image: "magma101_hfmr9"
          interface:
            - name: eth0
              type: INTERNAL
@@ -115,7 +115,6 @@ vnfd-catalog:
                    default-value: <orch_net>
              - name: reset-id
              - name: restart-magma

          monitoring-param:
            - id: agw_cpu_util
              nfvi-metric: cpu_utilization
@@ -142,7 +141,7 @@ vnfd-catalog:
            vcpu-count: 4
            memory-mb: 6144
            storage-gb: 100
            image: 'srsLTEzmqRF_hf9'
          image: "srsLTEzmqRF_hf9"
          interface:
            - name: eth0
              type: EXTERNAL
@@ -214,6 +213,18 @@ vnfd-catalog:
        - 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: