[VOL-2282]
Python 3 compatibility fixes and reorg
Moved the VOLTHA 1.x testCaseUtils.py to this repo, used by OLT.robot
Change-Id: I6936421e0d3155ad79c74e28058b8c0865daf107
diff --git a/src/test/cord-api/Framework/utils/openstackUtils.py b/src/test/cord-api/Framework/utils/openstackUtils.py
index 33e1fbf..3af4063 100644
--- a/src/test/cord-api/Framework/utils/openstackUtils.py
+++ b/src/test/cord-api/Framework/utils/openstackUtils.py
@@ -13,41 +13,39 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import absolute_import
-import time
-import json
-import collections
-import sys
-import os.path
import re
+
def get_neutron_lists(netlist):
- pairs = re.split("\+-*\+-*\+\n?",netlist)[2:-1]
- ids,names,subnets = [],[],[]
+ pairs = re.split(r"\+-*\+-*\+\n?", netlist)[2:-1]
+ ids, names, subnets = [], [], []
for p in pairs:
- for l in p.split('\n'):
- pair = l.split('|')
- if len(pair) > 1:
- ids.append(pair[1].strip())
- names.append(pair[2].strip())
- subnets.append(pair[3].strip())
- nets = dict(zip(names,subnets))
+ for l in p.split('\n'):
+ pair = l.split('|')
+ if len(pair) > 1:
+ ids.append(pair[1].strip())
+ names.append(pair[2].strip())
+ subnets.append(pair[3].strip())
+ nets = dict(zip(names, subnets))
return nets
-def get_nova_lists(novalist,nameWildCard=None):
- pairs = re.split("\+-*\+-*\+\n?",novalist)[2:-1]
- ids,names,status,taskState,powerState,networks = [],[],[],[],[],[]
+
+def get_nova_lists(novalist, nameWildCard=None):
+ pairs = re.split(r"\+-*\+-*\+\n?", novalist)[2:-1]
+ ids, names, status, taskState, powerState, networks = [], [], [], [], [], []
for p in pairs:
- for l in p.split('\n'):
- pair = l.split('|')
- if len(pair) > 1:
- ids.append(pair[1].strip())
- names.append(pair[2].strip())
- status.append(pair[3].strip())
- taskState.append(pair[4].strip())
- powerState.append(pair[5].strip())
- networks.append(pair[6].strip())
- instances = dict(zip(names,networks))
+ for l in p.split('\n'):
+ pair = l.split('|')
+ if len(pair) > 1:
+ ids.append(pair[1].strip())
+ names.append(pair[2].strip())
+ status.append(pair[3].strip())
+ taskState.append(pair[4].strip())
+ powerState.append(pair[5].strip())
+ networks.append(pair[6].strip())
+ instances = dict(zip(names, networks))
if nameWildCard is not None:
for key in instances.keys():
if re.match(nameWildCard, key):
@@ -55,23 +53,24 @@
else:
return instances
-def get_instance_status(novalist,nameWildCard=None):
- pairs = re.split("\+-*\+-*\+\n?",novalist)[2:-1]
- ids,names,status,taskState,powerState,networks = [],[],[],[],[],[]
+
+def get_instance_status(novalist, nameWildCard=None):
+ pairs = re.split(r"\+-*\+-*\+\n?", novalist)[2:-1]
+ ids, names, status, taskState, powerState, networks = [], [], [], [], [], []
for p in pairs:
- for l in p.split('\n'):
- pair = l.split('|')
- if len(pair) > 1:
- ids.append(pair[1].strip())
- names.append(pair[2].strip())
- status.append(pair[3].strip())
- taskState.append(pair[4].strip())
- powerState.append(pair[5].strip())
- networks.append(pair[6].strip())
- instances = dict(zip(names,status))
+ for l in p.split('\n'):
+ pair = l.split('|')
+ if len(pair) > 1:
+ ids.append(pair[1].strip())
+ names.append(pair[2].strip())
+ status.append(pair[3].strip())
+ taskState.append(pair[4].strip())
+ powerState.append(pair[5].strip())
+ networks.append(pair[6].strip())
+ instances = dict(zip(names, status))
if nameWildCard is not None:
for key in instances.keys():
if re.match(nameWildCard, key):
return instances[key]
else:
- return instances
\ No newline at end of file
+ return instances