Fuji api

cmd/nodecmd/create.go

@@ -161,10 +161,10 @@ func preCreateChecks(clusterName string) error {
 	if useSSHAgent && !utils.IsSSHAgentAvailable() {
 		return fmt.Errorf("ssh agent is not available")
 	}
-	if len(numAPINodes) > 0 && !globalNetworkFlags.UseDevnet {
-		return fmt.Errorf("API nodes can only be created in Devnet")
+	if len(numAPINodes) > 0 && !(globalNetworkFlags.UseDevnet || globalNetworkFlags.UseFuji) {
+		return fmt.Errorf("API nodes can only be created in Devnet/Fuji(Testnet)")
 	}
-	if globalNetworkFlags.UseDevnet && len(numAPINodes) != len(numValidatorsNodes) {
+	if (globalNetworkFlags.UseDevnet || globalNetworkFlags.UseFuji) && len(numAPINodes) != len(numValidatorsNodes) {
 		return fmt.Errorf("API nodes and Validator nodes must be deployed to same number of regions")
 	}
 	if len(numAPINodes) > 0 {
@@ -262,7 +262,6 @@ func createNodes(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	network = models.NewNetworkFromCluster(network, clusterName)
-
 	globalNetworkFlags.UseDevnet = network.Kind == models.Devnet // set globalNetworkFlags.UseDevnet to true if network is devnet for further use
 	avalancheGoVersion, err := getAvalancheGoVersion()
 	if err != nil {
@@ -1381,7 +1380,7 @@ func getRegionsNodeNum(cloudName string) (
 		if err != nil {
 			return nil, err
 		}
-		if globalNetworkFlags.UseDevnet {
+		if globalNetworkFlags.UseDevnet || globalNetworkFlags.UseFuji {
 			numAPINodes, err = app.Prompt.CaptureUint32(fmt.Sprintf("How many API nodes (nodes without stake) do you want to set up in %s %s?", userRegion, supportedClouds[cloudName].locationName))
 			if err != nil {
 				return nil, err
@@ -1392,7 +1391,7 @@ func getRegionsNodeNum(cloudName string) (
 		}
 		nodes[userRegion] = NumNodes{int(numNodes), int(numAPINodes)}
 		var currentInput []string
-		if globalNetworkFlags.UseDevnet {
+		if globalNetworkFlags.UseDevnet || globalNetworkFlags.UseFuji {
 			currentInput = utils.Map(maps.Keys(nodes), func(region string) string {
 				return fmt.Sprintf("[%s]: %d validator(s) %d api(s)", region, nodes[region].numValidators, nodes[region].numAPI)
 			})

cmd/nodecmd/create_aws.go

@@ -102,9 +102,9 @@ func getAWSCloudConfig(awsProfile string, singleNode bool, clusterSgRegions []st
 	switch {
 	case len(numValidatorsNodes) != len(utils.Unique(cmdLineRegion)):
 		return nil, nil, nil, fmt.Errorf("number of nodes and regions should be the same")
-	case globalNetworkFlags.UseDevnet && len(numAPINodes) != len(utils.Unique(cmdLineRegion)):
+	case (globalNetworkFlags.UseDevnet || globalNetworkFlags.UseFuji) && len(numAPINodes) != len(utils.Unique(cmdLineRegion)):
 		return nil, nil, nil, fmt.Errorf("number of api nodes and regions should be the same")
-	case globalNetworkFlags.UseDevnet && len(numAPINodes) != len(numValidatorsNodes):
+	case (globalNetworkFlags.UseDevnet || globalNetworkFlags.UseFuji) && len(numAPINodes) != len(numValidatorsNodes):
 		return nil, nil, nil, fmt.Errorf("number of api nodes and validator nodes should be the same")
 	case len(cmdLineRegion) == 0 && len(numValidatorsNodes) == 0 && len(numAPINodes) == 0:
 		var err error
@@ -127,7 +127,7 @@ func getAWSCloudConfig(awsProfile string, singleNode bool, clusterSgRegions []st
 		}
 	default:
 		for i, region := range cmdLineRegion {
-			if globalNetworkFlags.UseDevnet {
+			if globalNetworkFlags.UseDevnet || globalNetworkFlags.UseFuji {
 				finalRegions[region] = NumNodes{numValidatorsNodes[i], numAPINodes[i]}
 			} else {
 				finalRegions[region] = NumNodes{numValidatorsNodes[i], 0}

cmd/nodecmd/create_gcp.go

@@ -113,7 +113,7 @@ func getGCPConfig(singleNode bool) (*gcpAPI.GcpCloud, map[string]NumNodes, strin
 			}
 		}
 	default:
-		if globalNetworkFlags.UseDevnet {
+		if globalNetworkFlags.UseDevnet || globalNetworkFlags.UseFuji {
 			for i, region := range cmdLineRegion {
 				finalRegions[region] = NumNodes{numValidatorsNodes[i], numAPINodes[i]}
 			}