projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ubuntu xenial network service
[osm/devops.git]
/
src
/
generate_descriptor_pkg.sh
diff --git
a/src/generate_descriptor_pkg.sh
b/src/generate_descriptor_pkg.sh
index
b449673
..
cefd623
100755
(executable)
--- a/
src/generate_descriptor_pkg.sh
+++ b/
src/generate_descriptor_pkg.sh
@@
-65,7
+65,6
@@
INTF_TYPE='VIRTIO'
VCPU=2
MEMORY=4096
STORAGE=10
VCPU=2
MEMORY=4096
STORAGE=10
-CLOUD_INIT='#cloud-config '
INTERFACES=1
function usage() {
INTERFACES=1
function usage() {
@@
-198,7
+197,7
@@
EOF
# Cloud init file
cloud-init-file: '${cif}'
EOF
# Cloud init file
cloud-init-file: '${cif}'
EOF
- el
se
+ el
if [[ -n ${CLOUD_INIT} ]]; then
cat >>$desc_file <<EOF
# Cloud init to use
cloud-init: '${CLOUD_INIT}'
cat >>$desc_file <<EOF
# Cloud init to use
cloud-init: '${CLOUD_INIT}'
@@
-284,10
+283,10
@@
EOF
- id: ${name}_vld${i}
name: ${name}_vld${i}
type: ELAN
- id: ${name}_vld${i}
name: ${name}_vld${i}
type: ELAN
- provider-network:
- overlay-type: VLAN
- physical-network: <update>
- segmentation_id: <update>
+
#
provider-network:
+
#
overlay-type: VLAN
+
#
physical-network: <update>
+
#
segmentation_id: <update>
vnfd-connection-point-ref:
# Specify the constituent VNFs
# member-vnf-index-ref - entry from constituent vnf
vnfd-connection-point-ref:
# Specify the constituent VNFs
# member-vnf-index-ref - entry from constituent vnf
@@
-295,7
+294,7
@@
EOF
# vnfd-connection-point-ref - connection point name in the VNFD
- nsd:member-vnf-index-ref: 1
nsd:vnfd-id-ref: ${vnfd}
# vnfd-connection-point-ref - connection point name in the VNFD
- nsd:member-vnf-index-ref: 1
nsd:vnfd-id-ref: ${vnfd}
- # Validate the entry below
+ #
NOTE:
Validate the entry below
nsd:vnfd-connection-point-ref: eth${eth}
EOF
done
nsd:vnfd-connection-point-ref: eth${eth}
EOF
done
@@
-540,20
+539,20
@@
if [[ -z "$PKG" ]]; then
exit 1
fi
exit 1
fi
-cd $BASE_DIR
-if [ $? -ne 0 ]; then
+if [[ ! -d $BASE_DIR ]]; then
if [ $CREATE == true ]; then
mkdir -p $BASE_DIR
if [ $? -ne 0 ]; then
echo "ERROR: Unable to create base directory $BASE_DIR" >&2
exit 1
fi
if [ $CREATE == true ]; then
mkdir -p $BASE_DIR
if [ $? -ne 0 ]; then
echo "ERROR: Unable to create base directory $BASE_DIR" >&2
exit 1
fi
- cd $BASE_DIR
- else
- echo "ERROR: Unable to change to base directory $BASE_DIR!" >&2
- exit 1
fi
fi
fi
fi
+cd $BASE_DIR
+if [ $? -ne 0 ]; then
+ echo "ERROR: Unable to change to base directory $BASE_DIR!" >&2
+ exit 1
+fi
# Get full base dir path
BASE_DIR=`pwd`
# Get full base dir path
BASE_DIR=`pwd`