name nodes explicitly

Author: skudasov

framework/components/clnode/clnode.go

@@ -27,6 +27,7 @@ type Input struct {
 type NodeInput struct {
 	Image                   string   `toml:"image" validate:"required"`
 	Tag                     string   `toml:"tag" validate:"required"`
+	Name                    string   `toml:"name"`
 	PullImage               bool     `toml:"pull_image" default:"true"`
 	Port                    string   `toml:"port" validate:"required" default:"6688"`
 	P2PPort                 string   `toml:"p2p_port" validate:"required" default:"6690"`
@@ -131,7 +132,12 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 
 	httpPort := fmt.Sprintf("%s/tcp", in.Node.Port)
 	p2pPort := fmt.Sprintf("%s/udp", in.Node.P2PPort)
-	containerName := framework.DefaultTCName("clnode")
+	var containerName string
+	if in.Node.Name != "" {
+		containerName = in.Node.Name
+	} else {
+		containerName = framework.DefaultTCName("clnode")
+	}
 
 	req := tc.ContainerRequest{
 		AlwaysPullImage: in.Node.PullImage,

framework/components/simple_node_set/node_set.go

@@ -62,20 +62,39 @@ func NewSharedDBNodeSet(in *Input, bcOut *blockchain.Output, fakeUrl string) (*O
 	eg := &errgroup.Group{}
 	mu := &sync.Mutex{}
 	for i := 0; i < in.Nodes; i++ {
+		i := i
 		eg.Go(func() error {
 			net, err := clnode.NewNetworkCfgOneNetworkAllNodes(bcOut)
 			if err != nil {
 				return err
 			}
-			in.NodeSpec.Node.TestConfigOverrides = net
-			in.NodeSpec.DataProviderURL = fakeUrl
-			in.NodeSpec.Out = nil
+
+			nodeSpec := &clnode.Input{
+				DataProviderURL: fakeUrl,
+				DbInput:         in.NodeSpec.DbInput,
+				Node: &clnode.NodeInput{
+					Image:                   in.NodeSpec.Node.Image,
+					Tag:                     in.NodeSpec.Node.Tag,
+					Name:                    fmt.Sprintf("node%d", i),
+					PullImage:               in.NodeSpec.Node.PullImage,
+					Port:                    in.NodeSpec.Node.Port,
+					P2PPort:                 in.NodeSpec.Node.P2PPort,
+					CapabilitiesBinaryPaths: in.NodeSpec.Node.CapabilitiesBinaryPaths,
+					CapabilityContainerDir:  in.NodeSpec.Node.CapabilityContainerDir,
+					TestConfigOverrides:     net,
+					UserConfigOverrides:     in.NodeSpec.Node.UserConfigOverrides,
+					TestSecretsOverrides:    in.NodeSpec.Node.TestSecretsOverrides,
+					UserSecretsOverrides:    in.NodeSpec.Node.UserSecretsOverrides,
+				},
+			}
 
 			dbURL := strings.Replace(dbOut.DockerInternalURL, "/chainlink?sslmode=disable", fmt.Sprintf("/db_%d?sslmode=disable", i), -1)
-			o, err := clnode.NewNode(in.NodeSpec, &postgres.Output{
+			dbSpec := &postgres.Output{
 				Url:               dbOut.Url,
 				DockerInternalURL: dbURL,
-			})
+			}
+
+			o, err := clnode.NewNode(nodeSpec, dbSpec)
 			if err != nil {
 				return err
 			}