From 5538ed5471f5de3324924534cd8e43ee7c5a58d5 Mon Sep 17 00:00:00 2001 From: Carsten Koester Date: Sun, 10 Apr 2016 11:51:18 -0400 Subject: Fix cosmetic issues in VIRL topologies Fix cosmetic issues in VIRL topologies: - Replace double whitespace by single whitespace in XML - Remove reserved but unused IP address allocations from VIRL config - Modify "start-testcase" script to handle links without IP address Change-Id: Ie447bd91172df61b30ebb8650b56bdfca0f25fd4 Signed-off-by: Carsten Koester --- resources/tools/virl/bin/start-testcase | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'resources/tools/virl/bin/start-testcase') diff --git a/resources/tools/virl/bin/start-testcase b/resources/tools/virl/bin/start-testcase index e532ec7ef3..b46f5add27 100755 --- a/resources/tools/virl/bin/start-testcase +++ b/resources/tools/virl/bin/start-testcase @@ -261,8 +261,9 @@ def main(): for key2 in data[session_id][key]: topology[key]["nic-"+key2] = data[session_id][key][key2] if 'ip-address' in topology[key]["nic-"+key2]: - topology[key]["nic-"+key2]['ip-addr'] = re.split('\\/', \ - topology[key]["nic-"+key2]['ip-address'])[0] + if topology[key]["nic-"+key2]['ip-address'] is not None: + topology[key]["nic-"+key2]['ip-addr'] = re.split('\\/', \ + topology[key]["nic-"+key2]['ip-address'])[0] # Write ansible file ansiblehosts = open(os.path.join(scratch_directory, 'ansible-hosts'), 'w') -- cgit 1.2.3-korg