Commit 62b41967 authored by lavado's avatar lavado
Browse files

Merge branch 'master' into 'master' 

Adding Magma, srsLTE and Vyos GW

See merge request !4
parents 93e9a7dd 6c1161c5

hackfest_gateway_pnf/hackfest_gateway_vnf.yaml

0 → 100644
+39 −0
Original line number Diff line number Diff line 
vnfd:vnfd-catalog:

    vnfd:

    -   connection-point:

        -   name: gateway_public

            type: VPORT

        description: Gateway PNF

        id: hackfest_vyos_pnf

        mgmt-interface:

            cp: gateway_public

        name: hackfest_vyos_pnf

        short-name: hackfest_vyos_pnf

        vdu:

        -   description: gateway_pdu

            id: gateway_pdu

            interface:

            -   external-connection-point-ref: gateway_public

                name: eth0

                type: EXTERNAL

            pdu-type: gateway

        vnf-configuration:

            initial-config-primitive:

            -   name: config

                parameter:

                -   name: ssh-username

                    value: osm

                -   name: ssh-password

                    value: osm2020

                -   name: ssh-hostname

                    value: <rw_mgmt_ip>

                seq: '1'

            config-primitive:

            -   name: configure-remote

                parameter:

                -   name: filename

                    data-type: STRING

                    default-value: '/home/osm/touched'

            juju:

                charm: vyos-config

        version: '1.0'

hackfest_magma-agw-enb_nsd/README

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Descriptor created by OSM descriptor package generated

Created on Tue Jan 14 17:49:17 UTC 2020

hackfest_magma-agw-enb_nsd/hackfest_magma-agw-enb_nsd.yaml

0 → 100644
+52 −0
Original line number Diff line number Diff line 
nsd:nsd-catalog:

    nsd:

    -   id: hackfest_magma-agw-enb_nsd

        name: hackfest_magma-agw-enb_nsd

        short-name: hackfest_magma-agw-enb_nsd

        description: Magma AGW 1.0.0 with tools & srsLTE connected to PNF Gateway

        vendor: Whitestack

        version: '1.0'

        constituent-vnfd:

        -   member-vnf-index: 1

            vnfd-id-ref: hackfest_magma-agw-enb_vnfd

        -   member-vnf-index: 2

            vnfd-id-ref: hackfest_vyos_pnf

        vld:

        -   id: mgmt

            name: mgmt

            short-name: mgmt

            type: ELAN

            mgmt-network: 'true'

            vim-network-name: osm-ext

            vnfd-connection-point-ref:

            -   member-vnf-index-ref: 1

                vnfd-id-ref: hackfest_magma-agw-enb_vnfd

                vnfd-connection-point-ref: agw-mgmt

            -   member-vnf-index-ref: 1

                vnfd-id-ref: hackfest_magma-agw-enb_vnfd

                vnfd-connection-point-ref: srsLTE-mgmt

            -   member-vnf-index-ref: 2

                vnfd-connection-point-ref: gateway_public

        -   id: sgi

            name: sgi

            short-name: sgi

            type: ELAN

            vim-network-name: sgi

            vnfd-connection-point-ref:

            -   member-vnf-index-ref: 1

                vnfd-id-ref: hackfest_magma-agw-enb_vnfd

                vnfd-connection-point-ref: agw-sgi

            -   member-vnf-index-ref: 2

                vnfd-id-ref: hackfest_vyos_pnf

                vnfd-connection-point-ref: gateway_public

        # -   id: s1

        #     name: s1

        #     short-name: s1

        #     type: ELAN

        #     vnfd-connection-point-ref:

        #     -   member-vnf-index-ref: 1

        #         vnfd-id-ref: hackfest_magma-agw-enb_vnfd

        #         vnfd-connection-point-ref: agw-s1

        #     -   member-vnf-index-ref: 1

        #         vnfd-id-ref: hackfest_magma-agw-enb_vnfd

        #         vnfd-connection-point-ref: srsLTE-s1

magmagw @ fbbcbdaa

Original line number Diff line number Diff line 
Subproject commit fbbcbdaacb98be15447b191fd6f0d2110b867ff0

hackfest_magma-agw-enb_vnfd/hackfest_magma-agw-enb_vnfd.yaml

0 → 100644
+192 −0
Original line number Diff line number Diff line 
vnfd: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

            vm-flavor:

                vcpu-count: 2

                memory-mb: 4096

                storage-gb: 50

            guest-epa:

               cpu-pinning-policy: DEDICATED

               mempage-size: LARGE

            image: 'magma101e'

            interface:

            -   name: eth0

                type: EXTERNAL

                position: '0'

                virtual-interface:

                    type: PARAVIRT

                external-connection-point-ref: agw-mgmt

            -   name: eth1

                type: EXTERNAL

                position: '1'

                virtual-interface:

                    type: PARAVIRT

                internal-connection-point-ref: agw-s1

            -   name: eth2

                type: EXTERNAL

                position: '2'

                virtual-interface:

                    type: PARAVIRT

                external-connection-point-ref: agw-sgi

            internal-connection-point:

            -   id: agw-s1

                name: agw-s1

                short-name: agw-s1

                port-security-enabled: 'false'

            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

        -   id: srsLTE-vdu

            name: srsLTE-vdu

            description: srsLTE-vdu

            count: 1

            vm-flavor:

                vcpu-count: 2

                memory-mb: 8192

                storage-gb: 100

            image: 'srsLTEfauxRFc'

            interface:

            -   name: eth0

                type: EXTERNAL

                virtual-interface:

                    type: PARAVIRT

                external-connection-point-ref: srsLTE-mgmt

            -   name: eth1

                type: EXTERNAL

                virtual-interface:

                    type: PARAVIRT

                internal-connection-point-ref: srsLTE-s1

            internal-connection-point:

            -   id: srsLTE-s1

                name: srsLTE-s1

                short-name: srsLTE-s1

        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:

           config-access:

              ssh-access:

                 required: true

           initial-config-primitive:

           -  seq: '1'

              name: config

              parameter:

              -  name: ssh-hostname

                 value: <rw_mgmt_ip>

              -  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: <orch_ip>

              -  name: orch_net

                 value: <orch_net>

           -  seq: '4'

              name: add-gw

              parameter:

              -  name: agw_id

                 value: <agw_id>

              -  name: agw_name

                 value: <agw_name>

              -  name: orch_ip

                 value: <orch_ip>

              -  name: orch_net

                 value: <orch_net>

           -  seq: '5'

              name: add-hosts

              parameter:

              -  name: orch_ip

                 value: <orch_ip>

           -  seq: '6'

              name: restart-magma

           config-primitive:

             -  name: add-gw

                parameter:

                -  name: agw_id

                   default-value: <agw_id>

                -  name: agw_name

                   default-value: <agw_name>

                -  name: orch_ip

                   default-value: <orch_ip>

                -  name: orch_net

                   default-value: <orch_net>

             -  name: del-gw

                parameter:

                -  name: agw_id

                   default-value: <agw_id>

                -  name: orch_ip

                   default-value: <orch_ip>

                -  name: orch_net

                   default-value: <orch_net>

             -  name: reset-id

             -  name: restart-magma

           juju:

              charm: magmagw

        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