diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-05-20 12:29:55 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2016-05-28 08:42:02 -0400 |
| commit | f7032844ca19b833b5ee05a7698ace2823aa2fc2 (patch) | |
| tree | 38a8f53ebd64f4ae8253f81df0f33e201b95e357 /ci | |
| parent | 1695a72d5680fae3cf35d6a6dbd64de5dd08daf3 (diff) | |
Adding python tests and updating for conventions
- adding tests dir with a script to run python coverage
- adding main funtion to python per convention
- replacing underscores with dashes in CLI params per convention
Change-Id: I6f64174278e2a2e93eacdb7bee09aac49ce15d29
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 1ca3bcd6..1bbe5147 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -114,7 +114,7 @@ parse_setting_value() { ##parses network settings yaml into globals parse_network_settings() { local output - if output=$(python3.4 -B $LIB/python/apex-python-utils.py parse_net_settings -n $NETSETS -i $net_isolation_enabled); then + if output=$(python3.4 -B $LIB/python/apex-python-utils.py parse-net-settings -f $NETSETS -i $net_isolation_enabled); then echo -e "${blue}${output}${reset}" eval "$output" else @@ -635,12 +635,12 @@ function configure_undercloud { echo -e "${blue}Network Environment set for Deployment: ${reset}" cat $CONFIG/network-environment.yaml scp ${SSH_OPTIONS[@]} $CONFIG/network-environment.yaml "stack@$UNDERCLOUD": - if ! controller_nic_template=$(python3.4 -B $LIB/python/apex-python-utils.py nic_template -d $CONFIG -f nics-controller.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family); then + if ! controller_nic_template=$(python3.4 -B $LIB/python/apex-python-utils.py nic-template -t $CONFIG/nics-controller.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family); then echo -e "${red}ERROR: Failed to generate controller NIC heat template ${reset}" exit 1 fi - if ! compute_nic_template=$(python3.4 -B $LIB/python/apex-python-utils.py nic_template -d $CONFIG -f nics-compute.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family); then + if ! compute_nic_template=$(python3.4 -B $LIB/python/apex-python-utils.py nic-template -t $CONFIG/nics-compute.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family); then echo -e "${red}ERROR: Failed to generate compute NIC heat template ${reset}" exit 1 fi |