From ec04a6194a36a83f7e055a4822431213c4a2129e Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 25 Jun 2018 22:59:36 +0200 Subject: [PATCH] Updated generate_descriptor_pkg to work with Rel FOUR Change-Id: I8a3f7dc34bdb534671862c192fc4e255a62e6b57 Signed-off-by: garciadeblas --- .../tools/generate_descriptor_pkg.sh | 91 +++++++++---------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/descriptor-packages/tools/generate_descriptor_pkg.sh b/descriptor-packages/tools/generate_descriptor_pkg.sh index 5cf2510d..1a30cf1e 100755 --- a/descriptor-packages/tools/generate_descriptor_pkg.sh +++ b/descriptor-packages/tools/generate_descriptor_pkg.sh @@ -173,7 +173,7 @@ vnfd:vnfd-catalog: - id: ${name} name: ${name} short-name: ${name} - description: Generated by OSM pacakage generator + description: Generated by OSM package generator vendor: ${VENDOR} version: '1.0' @@ -182,7 +182,7 @@ vnfd:vnfd-catalog: # Management interface mgmt-interface: - vdu-id: ${name}-VM + cp: vnf-cp0 # Atleast one VDU need to be specified vdu: @@ -231,23 +231,18 @@ EOF type: EXTERNAL virtual-interface: type: VIRTIO - bandwidth: '0' - vpci: '0000:00:0a.0' - external-connection-point-ref: eth0 + external-connection-point-ref: vnf-cp0 EOF # Add external interfaces for i in `seq 1 ${INTERFACES}`; do eth=$(($i)) - pci=$(get_pci $eth) cat >>$desc_file <>$desc_file <>$desc_file < - # provider-network: - # overlay-type: VLAN - # segmentation_id: - vnfd-connection-point-ref: - # Specify the constituent VNFs - # member-vnf-index-ref - entry from constituent vnf - # vnfd-id-ref - VNFD id - # vnfd-connection-point-ref - connection point name in the VNFD - - nsd:member-vnf-index-ref: 1 - nsd:vnfd-id-ref: ${vnfd} - # NOTE: Validate the entry below - nsd:vnfd-connection-point-ref: eth0 + - id: ${name}_vld0 + name: management + short-name: management + type: ELAN + mgmt-network: 'true' + # vim-network-name: + # provider-network: + # overlay-type: VLAN + # segmentation_id: + vnfd-connection-point-ref: + # Specify the constituent VNFs + # member-vnf-index-ref - entry from constituent vnf + # vnfd-id-ref - VNFD id + # vnfd-connection-point-ref - connection point name in the VNFD + - member-vnf-index-ref: 1 + vnfd-id-ref: ${vnfd} + # NOTE: Validate the entry below + vnfd-connection-point-ref: vnf-cp0 EOF # Add rest of VLDs for i in `seq 1 ${INTERFACES}`; do eth=$(($i)) cat >>$desc_file < - # provider-network: - # overlay-type: VLAN - # segmentation_id: - vnfd-connection-point-ref: - # Specify the constituent VNFs - # member-vnf-index-ref - entry from constituent vnf - # vnfd-id-ref - VNFD id - # vnfd-connection-point-ref - connection point name in the VNFD - - nsd:member-vnf-index-ref: 1 - nsd:vnfd-id-ref: ${vnfd} - # NOTE: Validate the entry below - nsd:vnfd-connection-point-ref: eth${eth} + - id: ${name}_vld${i} + name: ${name}_vld${i} + short-name: ${name}_vld${i} + type: ELAN + # vim-network-name: + # provider-network: + # overlay-type: VLAN + # segmentation_id: + vnfd-connection-point-ref: + # Specify the constituent VNFs + # member-vnf-index-ref - entry from constituent vnf + # vnfd-id-ref - VNFD id + # vnfd-connection-point-ref - connection point name in the VNFD + - member-vnf-index-ref: 1 + vnfd-id-ref: ${vnfd} + # NOTE: Validate the entry below + vnfd-connection-point-ref: vnf-cp${eth} EOF - done + done if [ $VERBOSE == true ]; then echo "INFO: Created $desc_file" -- 2.25.1