Incorporate review comments

Author: Satish Ramachandran

netctl/commands.go

@@ -279,14 +279,14 @@ var Commands = []cli.Command{
 				Name:    "rm",
 				Aliases: []string{"delete"},
 				Usage:   "Delete external contracts",
-				Flags:     []cli.Flag{tenantFlag},
+				Flags:   []cli.Flag{tenantFlag},
 				Action:  deleteExternalContracts,
 			},
 			{
 				Name:  "create",
 				Usage: "Create external contracts",
 				Flags: []cli.Flag{
-				    tenantFlag,
+					tenantFlag,
 					cli.BoolFlag{
 						Name:  "consumed, c",
 						Usage: "External contracts type - consumed",

netctl/netctl.go

@@ -819,7 +819,7 @@ func listExternalContracts(ctx *cli.Context) {
 	extContractsGroups, err := getClient(ctx).ExtContractsGroupList()
 	errCheck(ctx, err)
 
-    tenant := ctx.String("tenant")
+	tenant := ctx.String("tenant")
 
 	if ctx.Bool("json") {
 		dumpJSONList(ctx, extContractsGroups)
@@ -833,9 +833,9 @@ func listExternalContracts(ctx *cli.Context) {
 		writer := tabwriter.NewWriter(os.Stdout, 0, 2, 2, ' ', 0)
 		defer writer.Flush()
 		for _, extContractsGroup := range *extContractsGroups {
-            if extContractsGroup.TenantName != tenant {
-                continue
-            }
+			if extContractsGroup.TenantName != tenant {
+				continue
+			}
 			writer.Write([]byte(fmt.Sprintf(" Name: %s\t\tType: %s\n", extContractsGroup.ContractsGroupName, extContractsGroup.ContractsType)))
 			writer.Write([]byte(fmt.Sprintf(" Contracts:\n")))
 			for _, contract := range extContractsGroup.Contracts {
@@ -848,7 +848,7 @@ func listExternalContracts(ctx *cli.Context) {
 func deleteExternalContracts(ctx *cli.Context) {
 	argCheck(1, ctx)
 	contractsGroupName := ctx.Args()[0]
-    tenant := ctx.String("tenant")
+	tenant := ctx.String("tenant")
 
 	logrus.Infof("Deleting external contracts group %s in tenant %s", contractsGroupName, tenant)
 	errCheck(ctx, getClient(ctx).ExtContractsGroupDelete(tenant, contractsGroupName))
@@ -868,8 +868,8 @@ func createExternalContracts(ctx *cli.Context) {
 	} else {
 		errExit(ctx, exitHelp, "Either provided or consumed must be specified", false)
 	}
-    
-    tenant := ctx.String("tenant")
+
+	tenant := ctx.String("tenant")
 
 	contracts := strings.Split(ctx.String("contracts"), ",")
 	if ctx.String("contracts") == "" {
@@ -879,7 +879,7 @@ func createExternalContracts(ctx *cli.Context) {
 	contractsGroupName := ctx.Args()[0]
 
 	errCheck(ctx, getClient(ctx).ExtContractsGroupPost(&contivClient.ExtContractsGroup{
-        TenantName:         tenant,
+		TenantName:         tenant,
 		ContractsGroupName: contractsGroupName,
 		ContractsType:      contractsType,
 		Contracts:          contracts,

netmaster/objApi/extContracts.go

@@ -88,9 +88,9 @@ func extContractsGrpValidateAndRegister(epg *contivModel.EndpointGroup,
 // Cleanup external contracts from an epg.
 func cleanupExternalContracts(endpointGroup *contivModel.EndpointGroup) error {
 	// Cleanup consumed external contracts
-    tenant := endpointGroup.TenantName
+	tenant := endpointGroup.TenantName
 	for _, consExtContractsGrp := range endpointGroup.ConsExtContractsGrps {
-        contractsGrpKey := tenant + ":" + consExtContractsGrp
+		contractsGrpKey := tenant + ":" + consExtContractsGrp
 		contractsGrp := contivModel.FindExtContractsGroup(contractsGrpKey)
 		err := extContractsGrpDeregister(endpointGroup, contractsGrp, "consumed")
 		if err != nil {
@@ -103,7 +103,7 @@ func cleanupExternalContracts(endpointGroup *contivModel.EndpointGroup) error {
 
 	// Cleanup provided external contracts
 	for _, provExtContractsGrp := range endpointGroup.ProvExtContractsGrps {
-        contractsGrpKey := tenant + ":" + provExtContractsGrp
+		contractsGrpKey := tenant + ":" + provExtContractsGrp
 		contractsGrp := contivModel.FindExtContractsGroup(contractsGrpKey)
 		err := extContractsGrpDeregister(endpointGroup, contractsGrp, "provided")
 		if err != nil {
@@ -121,9 +121,9 @@ func cleanupExternalContracts(endpointGroup *contivModel.EndpointGroup) error {
 func setupExternalContracts(endpointGroup *contivModel.EndpointGroup,
 	consContractsGrps, provContractsGrps []string) error {
 	// Validate presence and register consumed external contracts
-    tenant := endpointGroup.TenantName
+	tenant := endpointGroup.TenantName
 	for _, consExtContractsGrp := range consContractsGrps {
-        contractsGrpKey := tenant + ":" + consExtContractsGrp
+		contractsGrpKey := tenant + ":" + consExtContractsGrp
 		contractsGrp := contivModel.FindExtContractsGroup(contractsGrpKey)
 		err := extContractsGrpValidateAndRegister(endpointGroup, contractsGrp, "consumed")
 		if err != nil {
@@ -133,7 +133,7 @@ func setupExternalContracts(endpointGroup *contivModel.EndpointGroup,
 
 	// Validate presence and register provided external contracts
 	for _, provExtContractsGrp := range provContractsGrps {
-        contractsGrpKey := tenant + ":" + provExtContractsGrp
+		contractsGrpKey := tenant + ":" + provExtContractsGrp
 		contractsGrp := contivModel.FindExtContractsGroup(contractsGrpKey)
 		err := extContractsGrpValidateAndRegister(endpointGroup, contractsGrp, "provided")
 		if err != nil {
@@ -155,32 +155,32 @@ func isExtContractsGroupUsed(contractsGroup *contivModel.ExtContractsGroup) bool
 
 // ExtContractsGroupCreate creates a new group of external contracts
 func (ac *APIController) ExtContractsGroupCreate(contractsGroup *contivModel.ExtContractsGroup) error {
-    log.Infof("Received ExtContractsGroupCreate: %+v", contractsGroup)
+	log.Infof("Received ExtContractsGroupCreate: %+v", contractsGroup)
 
-    // NOTE: Nothing more needs to be done here. This object 
-    // need not be created in the masterCfg. 
+	// NOTE: Nothing more needs to be done here. This object
+	// need not be created in the masterCfg.
 
-    return nil
+	return nil
 }
 
 // ExtContractsGroupUpdate updates an existing group of contract sets
 func (ac *APIController) ExtContractsGroupUpdate(contractsGroup, params *contivModel.ExtContractsGroup) error {
-    log.Infof("Received ExtContractsGroupUpdate: %+v, params: %+v", contractsGroup, params)
-    log.Errorf("Error: external contracts update not supported: %s", contractsGroup.ContractsGroupName)
+	log.Infof("Received ExtContractsGroupUpdate: %+v, params: %+v", contractsGroup, params)
+	log.Errorf("Error: external contracts update not supported: %s", contractsGroup.ContractsGroupName)
 
-    return core.Errorf("external contracts update not supported")
+	return core.Errorf("external contracts update not supported")
 }
 
 // ExtContractsGroupDelete deletes an existing external contracts group
 func (ac *APIController) ExtContractsGroupDelete(contractsGroup *contivModel.ExtContractsGroup) error {
-    log.Infof("Received ExtContractsGroupDelete: %+v", contractsGroup)
+	log.Infof("Received ExtContractsGroupDelete: %+v", contractsGroup)
 
-    // At this moment, we let the external contracts to be deleted only
-    // if there are no consumers of this external contracts group
-    if isExtContractsGroupUsed(contractsGroup) == true {
-        log.Errorf("Error: External contracts groups is being used: %s", contractsGroup.ContractsGroupName)
-        return core.Errorf("External contracts group is in-use")
-    }
+	// At this moment, we let the external contracts to be deleted only
+	// if there are no consumers of this external contracts group
+	if isExtContractsGroupUsed(contractsGroup) == true {
+		log.Errorf("Error: External contracts groups is being used: %s", contractsGroup.ContractsGroupName)
+		return core.Errorf("External contracts group is in-use")
+	}
 
-    return nil
+	return nil
 }