From 1b645f616d2969645ea05112a685d1c4ba6ed8a6 Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 5 Mar 2021 16:51:23 -0500 Subject: [PATCH] Modernizing Wiki Example Removed unused interfaces Updated subnet and IP addresses to match the hardcoded config for haproxy.qcow2 Signed-off-by: beierlm --- .../wiki_webserver_autoscale_nsd.yaml | 9 ------ .../wiki_webserver_autoscale_vnfd.yaml | 31 ++++--------------- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/wiki_webserver_autoscale_nsd/wiki_webserver_autoscale_nsd.yaml b/wiki_webserver_autoscale_nsd/wiki_webserver_autoscale_nsd.yaml index 995235dd..f3fa3dd4 100644 --- a/wiki_webserver_autoscale_nsd/wiki_webserver_autoscale_nsd.yaml +++ b/wiki_webserver_autoscale_nsd/wiki_webserver_autoscale_nsd.yaml @@ -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 diff --git a/wiki_webserver_autoscale_vnfd/wiki_webserver_autoscale_vnfd.yaml b/wiki_webserver_autoscale_vnfd/wiki_webserver_autoscale_vnfd.yaml index 7f10921e..bcd0b037 100644 --- a/wiki_webserver_autoscale_vnfd/wiki_webserver_autoscale_vnfd.yaml +++ b/wiki_webserver_autoscale_vnfd/wiki_webserver_autoscale_vnfd.yaml @@ -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: -- GitLab