Fix custom cluster.json file generation
Change-Id: I79c6bc04a6f7bcd63cdc688c231164baa776d96e
diff --git a/TestON/tests/HA/HAscaling/dependencies/onos-gen-partitions b/TestON/tests/HA/HAscaling/dependencies/onos-gen-partitions
index 2e49db0..303427a 100755
--- a/TestON/tests/HA/HAscaling/dependencies/onos-gen-partitions
+++ b/TestON/tests/HA/HAscaling/dependencies/onos-gen-partitions
@@ -27,12 +27,6 @@
node = lambda k: { 'id': k, 'ip': k, 'port': port }
return [ node(environ[v]) for v in vars ]
-def generate_base_partition(nodes):
- return {
- 'id': 0,
- 'members': nodes
- }
-
def generate_extended_partitions_scaling(nodes, k, partitions=3, equal=False):
l = deque(nodes)
perms = []
@@ -64,11 +58,9 @@
if num:
nodes = nodes[:num]
- base_partition = generate_base_partition([v.get('id') for v in nodes])
extended_partitions = generate_extended_partitions_scaling([v.get('id') for v in nodes],
3, equal=equal)
partitions = []
- partitions.append(base_partition)
partitions.extend(extended_partitions)
name = hash("HAScaling")
data = {
diff --git a/TestON/tests/HA/HAswapNodes/dependencies/onos-gen-partitions b/TestON/tests/HA/HAswapNodes/dependencies/onos-gen-partitions
index ae7da6c..90231e3 100755
--- a/TestON/tests/HA/HAswapNodes/dependencies/onos-gen-partitions
+++ b/TestON/tests/HA/HAswapNodes/dependencies/onos-gen-partitions
@@ -27,12 +27,6 @@
node = lambda k: { 'id': k, 'ip': k, 'port': port }
return [ node(environ[v]) for v in vars ]
-def generate_base_partition(nodes):
- return {
- 'id': 0,
- 'members': nodes
- }
-
def generate_extended_partitions_scaling(nodes, k, partitions=3, equal=False):
l = deque(nodes)
perms = []
@@ -65,11 +59,9 @@
if num:
nodes = nodes[:num]
- base_partition = generate_base_partition([v.get('id') for v in nodes])
extended_partitions = generate_extended_partitions_scaling([v.get('id') for v in nodes],
3, equal=equal)
partitions = []
- partitions.append(base_partition)
partitions.extend(extended_partitions)
name = hash("HAScaling")
data = {