Commit e810ca84 authored by Mark Beierl's avatar Mark Beierl
Browse files

Merge branch 'beierlm-wiki-update' into 'master' 

Modernizing Wiki Example

See merge request !136
parents abea6e4d 1b645f61

wiki_webserver_autoscale_nsd/wiki_webserver_autoscale_nsd.yaml

+0 −9
Original line number Diff line number Diff line
@@ -7,12 +7,6 @@ nsd: 
            vnf-profile:

            -   id: '1'

                virtual-link-connectivity:

                -   constituent-cpd-id:

                    -   constituent-base-element-id: '1'

                        constituent-cpd-id: haproxy_mgmt-ext

                    -   constituent-base-element-id: '1'

                        constituent-cpd-id: apache_mgmt-ext

                    virtual-link-profile-id: mgmt_vld

                -   constituent-cpd-id:

                    -   constituent-base-element-id: '1'

                        constituent-cpd-id: haproxy_public-ext
@@ -22,9 +16,6 @@ nsd: 
        name: wiki_webserver_autoscale_ns

        version: '1.0'

        virtual-link-desc:

        -   id: mgmt_vld

            mgmt-network: 'true'

            vim-network-name: mgntnet

        -   id: public_vld

            mgmt-network: 'true'

            vim-network-name: osm-ext

wiki_webserver_autoscale_vnfd/wiki_webserver_autoscale_vnfd.yaml

+6 −25
Original line number Diff line number Diff line
@@ -42,10 +42,10 @@ vnfd: 
            id: internal_services

            virtual-link-protocol-data:

                l3-protocol-data:

                    cidr: 192.168.30.0/24

                    cidr: 192.168.28.0/28

                    description: Services Subnet

                    dhcp-enabled: true

                    gateway-ip: 192.168.30.1

                    gateway-ip: 192.168.28.14

                    ip-version: ipv4

                    name: internal_services-l3-protocol-data

    ext-cpd:
@@ -53,18 +53,10 @@ vnfd: 
        int-cpd:

            cpd: haproxy_vdu_eth1-int

            vdu-id: haproxy_vdu

    -   id: haproxy_mgmt-ext

        int-cpd:

            cpd: haproxy_vdu_eth0-int

            vdu-id: haproxy_vdu

    -   id: apache_mgmt-ext

        int-cpd:

            cpd: apache_vdu_eth0-int

            vdu-id: apache_vdu

    id: wiki_webserver_autoscale_vnf

    int-virtual-link-desc:

    -   id: internal_services

    mgmt-cp: haproxy_mgmt-ext

    mgmt-cp: haproxy_public-ext

    product-name: wiki_webserver_autoscale_vnf

    provider: Altran

    sw-image-desc:
@@ -80,15 +72,9 @@ vnfd: 
        id: haproxy_vdu

        int-cpd:

        -   id: haproxy_vdu_eth1-int

            virtual-network-interface-requirement:

            -   name: haproxy_vdu_eth1

                position: 1

                virtual-interface:

                    type: VIRTIO

        -   id: haproxy_vdu_eth0-int

            virtual-network-interface-requirement:

            -   name: haproxy_vdu_eth0

                position: 2

                position: 1

                virtual-interface:

                    type: VIRTIO

        -   id: haproxy_vdu_eth2-int
@@ -96,6 +82,7 @@ vnfd: 
            virtual-network-interface-requirement:

            -   name: haproxy_vdu_eth2

                position: 3

                ip-address: 192.168.28.2

                virtual-interface:

                    type: VIRTIO

        name: haproxy_vdu
@@ -107,17 +94,11 @@ vnfd: 
        description: apache_vdu

        id: apache_vdu

        int-cpd:

        -   id: apache_vdu_eth0-int

            virtual-network-interface-requirement:

            -   name: apache_vdu_eth0

                position: 1

                virtual-interface:

                    type: VIRTIO

        -   id: apache_vdu_eth1-int

            int-virtual-link-desc: internal_services

            virtual-network-interface-requirement:

            -   name: apache_vdu_eth1

                position: 2

                position: 1

                virtual-interface:

                    type: VIRTIO

        monitoring-parameter: