diff options
-rwxr-xr-x | vagrant/tests/_common.sh | 20 | ||||
-rwxr-xr-x | vagrant/tests/integration_cFW.sh | 2 | ||||
-rwxr-xr-x | vagrant/tests/integration_vFW.sh | 2 | ||||
-rwxr-xr-x | vagrant/tests/integration_vcFW.sh | 2 | ||||
-rwxr-xr-x | vagrant/tests/multus.sh | 2 | ||||
-rwxr-xr-x | vagrant/tests/virtlet.sh | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/vagrant/tests/_common.sh b/vagrant/tests/_common.sh index e5f269dc..a8f01baf 100755 --- a/vagrant/tests/_common.sh +++ b/vagrant/tests/_common.sh @@ -22,9 +22,9 @@ virtlet_deployment_name=virtlet-deployment plugin_deployment_name=plugin-deployment plugin_service_name=plugin-service -# popule_CSAR_containers_vFW() - This function creates the content of CSAR file +# populate_CSAR_containers_vFW() - This function creates the content of CSAR file # required for vFirewal using only containers -function popule_CSAR_containers_vFW { +function populate_CSAR_containers_vFW { local csar_id=$1 _checks_args $csar_id @@ -186,10 +186,10 @@ DEPLOYMENT popd } -# popule_CSAR_vms_containers_vFW() - This function creates the content of CSAR file +# populate_CSAR_vms_containers_vFW() - This function creates the content of CSAR file # required for vFirewal using an hybrid combination between virtual machines and # cotainers -function popule_CSAR_vms_containers_vFW { +function populate_CSAR_vms_containers_vFW { local csar_id=$1 ssh_key=$(cat $HOME/.ssh/id_rsa.pub) @@ -484,9 +484,9 @@ DEPLOYMENT popd } -# popule_CSAR_vms_vFW() - This function creates the content of CSAR file +# populate_CSAR_vms_vFW() - This function creates the content of CSAR file # required for vFirewal using only virtual machines -function popule_CSAR_vms_vFW { +function populate_CSAR_vms_vFW { local csar_id=$1 ssh_key=$(cat $HOME/.ssh/id_rsa.pub) @@ -774,9 +774,9 @@ DEPLOYMENT popd } -# popule_CSAR_multus() - This function creates the content of CSAR file +# populate_CSAR_multus() - This function creates the content of CSAR file # required for testing Multus feature -function popule_CSAR_multus { +function populate_CSAR_multus { local csar_id=$1 _checks_args $csar_id @@ -839,9 +839,9 @@ DEPLOYMENT popd } -# popule_CSAR_virtlet() - This function creates the content of CSAR file +# populate_CSAR_virtlet() - This function creates the content of CSAR file # required for testing Virtlet feature -function popule_CSAR_virtlet { +function populate_CSAR_virtlet { local csar_id=$1 _checks_args $csar_id diff --git a/vagrant/tests/integration_cFW.sh b/vagrant/tests/integration_cFW.sh index 4a452599..0077c73d 100755 --- a/vagrant/tests/integration_cFW.sh +++ b/vagrant/tests/integration_cFW.sh @@ -18,7 +18,7 @@ source _functions.sh csar_id=4f726e2a-b74a-11e8-ad7c-525400feed2 # Setup -popule_CSAR_containers_vFW $csar_id +populate_CSAR_containers_vFW $csar_id pushd ${CSAR_DIR}/${csar_id} for network in unprotected-private-net-cidr-network protected-private-net-cidr-network onap-private-net-cidr-network; do diff --git a/vagrant/tests/integration_vFW.sh b/vagrant/tests/integration_vFW.sh index 237593f2..e0f7075e 100755 --- a/vagrant/tests/integration_vFW.sh +++ b/vagrant/tests/integration_vFW.sh @@ -21,7 +21,7 @@ csar_id=66fea6f0-b74d-11e8-95a0-525400feed26 if [[ ! -f $HOME/.ssh/id_rsa.pub ]]; then echo -e "\n\n\n" | ssh-keygen -t rsa -N "" fi -popule_CSAR_vms_vFW $csar_id +populate_CSAR_vms_vFW $csar_id pushd ${CSAR_DIR}/${csar_id} for resource in unprotected-private-net-cidr-network protected-private-net-cidr-network onap-private-net-cidr-network; do diff --git a/vagrant/tests/integration_vcFW.sh b/vagrant/tests/integration_vcFW.sh index 82159b90..4fadfa23 100755 --- a/vagrant/tests/integration_vcFW.sh +++ b/vagrant/tests/integration_vcFW.sh @@ -21,7 +21,7 @@ csar_id=aa443e7e-c8ba-11e8-8877-525400b164ff if [[ ! -f $HOME/.ssh/id_rsa.pub ]]; then echo -e "\n\n\n" | ssh-keygen -t rsa -N "" fi -popule_CSAR_vms_containers_vFW $csar_id +populate_CSAR_vms_containers_vFW $csar_id pushd ${CSAR_DIR}/${csar_id} for resource in unprotected-private-net-cidr-network protected-private-net-cidr-network onap-private-net-cidr-network sink-service sink-ingress; do diff --git a/vagrant/tests/multus.sh b/vagrant/tests/multus.sh index 96fa37d8..859fa3bb 100755 --- a/vagrant/tests/multus.sh +++ b/vagrant/tests/multus.sh @@ -18,7 +18,7 @@ source _functions.sh csar_id=49408ca6-b75b-11e8-8076-525400feed26 # Setup -popule_CSAR_multus $csar_id +populate_CSAR_multus $csar_id pushd ${CSAR_DIR}/${csar_id} kubectl apply -f bridge-network.yaml diff --git a/vagrant/tests/virtlet.sh b/vagrant/tests/virtlet.sh index f941789c..268247ba 100755 --- a/vagrant/tests/virtlet.sh +++ b/vagrant/tests/virtlet.sh @@ -18,7 +18,7 @@ source _functions.sh csar_id=6b54a728-b76a-11e8-a1ba-52540053ccc8 # Setup -popule_CSAR_virtlet $csar_id +populate_CSAR_virtlet $csar_id pushd ${CSAR_DIR}/${csar_id} |