algorand · algojohnlee · Sep 3, 2020 · Jun 11, 2020 · Jun 12, 2020 · Jun 14, 2020
diff --git a/docker/build/Dockerfile-deploy b/docker/build/Dockerfile-deploy
@@ -6,7 +6,7 @@ WORKDIR /root
 RUN wget --quiet https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz && tar -xvf go${GOLANG_VERSION}.linux-amd64.tar.gz && mv go /usr/local
 ENV GOROOT=/usr/local/go \
     GOPATH=$HOME/go \
-    GOPROXY=https://gocenter.io,https://goproxy.io,direct
+    GOPROXY=https://gocenter.io
 RUN mkdir -p $GOPATH/src/github.com/algorand
 WORKDIR $GOPATH/src/github.com/algorand
 COPY . ./go-algorand/

diff --git a/netdeploy/remote/deployedNetwork.go b/netdeploy/remote/deployedNetwork.go
@@ -360,6 +360,7 @@ type cloudHostConfiguration struct {
 
 type cloudHostSpec struct {
 	Name           string
+	Group          string
 	Provider       string
 	Region         string
 	InstanceType   string
@@ -404,6 +405,14 @@ func (cfg DeployedNetwork) GenerateCloudTemplate(templates HostTemplates, target
 		if err != nil {
 			return
 		}
+
+		group := strings.TrimSpace(cloudHost.Group)
+		if group == "" {
+			hostSpec.Group = "default"
+		} else {
+			hostSpec.Group = group
+		}
+
 		topology.Hosts = append(topology.Hosts, hostSpec)
 	}
 
@@ -488,6 +497,7 @@ func createHostSpec(host HostConfig, template cloudHost) (hostSpec cloudHostSpec
 	}
 
 	hostSpec.Name = host.Name
+	hostSpec.Group = host.Group
 	hostSpec.Provider = template.Provider
 	hostSpec.Region = template.Region
 	hostSpec.InstanceType = template.BaseConfiguration

diff --git a/netdeploy/remote/hostConfig.go b/netdeploy/remote/hostConfig.go
@@ -19,5 +19,6 @@ package remote
 // HostConfig represents the configuration of a single deployed Host
 type HostConfig struct {
 	Name  string
+	Group string
 	Nodes []NodeConfig
 }
diff --git a/netdeploy/remote/topology.go b/netdeploy/remote/topology.go
@@ -23,6 +23,7 @@ import (
 
 type cloudHostType struct {
 	Name     string
+	Group    string
 	Template string
 }
 

diff --git a/test/testdata/deployednettemplates/recipes/network-partition/Makefile b/test/testdata/deployednettemplates/recipes/network-partition/Makefile
@@ -0,0 +1,12 @@
+PARAMS=-w 100 -R 8 -N 20 -n 100 -H 10 --node-template node.json --relay-template relay.json --non-participating-node-template nonPartNode.json
+
+all:	net.json genesis.json
+
+net.json:	node.json nonPartNode.json ${GOPATH}/bin/netgoal
+	netgoal generate -t net -r /tmp/wat -o net.json ${PARAMS}
+
+genesis.json:	${GOPATH}/bin/netgoal
+	netgoal generate -t genesis -r /tmp/wat -o genesis.json ${PARAMS}
+
+clean:
+	rm -f net.json genesis.json
diff --git a/test/testdata/deployednettemplates/recipes/network-partition/gen_topology.py b/test/testdata/deployednettemplates/recipes/network-partition/gen_topology.py
@@ -0,0 +1,72 @@
+import random
+
+node_types = {"R":8, "N":20, "NPN":10}
+node_size = {"R":"-m5d.4xl", "N":"-m5d.4xl", "NPN":"-m5d.4xl"}
+partitions = {"A":50, "B":20, "C":10, "D":10, "E":5, "F":5}
+regions = [
+    "AWS-US-EAST-2",
+    "AWS-US-WEST-1"
+]
+
+def gen_topology(ranges):
+    f = open("topology.json", "w")
+    f.write("{ \"Hosts\":\n  [")
+    node_groups = {}
+
+    region_count = len(regions)
+    first = True
+    for  x in node_types:
+        node_type = x
+        node_count = node_types[x]
+        region_size = node_size[x]
+        for i in range(node_count):
+            node_name = node_type + str(i+1)
+            region = regions[i%region_count]
+            # randomly assign the node to a partition
+            partition = get_partition(ranges)
+            node_groups.setdefault(partition,[]).append(node_name);
+            if (first ):
+                first = False
+            else:
+                f.write(",")
+            f.write ("\n    {\n      \"Name\": \"" + node_name + "\",\n      \"Group\": \"" + partition + "\",\n      \"Template\": \"" + region + region_size + "\"\n    }"  )
+
+    f.write("\n  ]\n}\n")
+    f.close()
+
+    for node_group in node_groups:
+        f = open("group_" + node_group + ".txt", "w")
+        for node in node_groups[node_group]:
+            f.write(node +"\n")
+        f.close()
+
+
+def get_partition(ranges):
+    random_value = random.randint(1,100)
+    for partition_name  in ranges:
+        partition_value = ranges[partition_name]
+        if random_value >= partition_value['start']  and random_value <= partition_value['end'] :
+            return partition_name
+    print("error, partition not found for random_value ", random_value)
+    exit(1)
+
+def get_ranges():
+    ranges = {}
+    start_pos = 1;
+    for name, size in partitions.items():
+        if (start_pos > 100) :
+            print("error, range exceeded 100")
+            exit(1)
+        end_pos = start_pos + size - 1
+        ranges[name] = {"start": start_pos, "end": end_pos}
+        start_pos = end_pos + 1
+    print(ranges)
+    return ranges
+
+ranges = get_ranges()
+
+# for i in range(10):
+#     partition_name = get_partition(ranges)
+#     print(i, partition_name)
+
+gen_topology(ranges)