Merge pull request #10 from lavanya-f5/update_iprange

handle invalid provider param

cmd/f5-ipam-controller/main.go

@@ -8,12 +8,12 @@ import (
 	"strings"
 	"syscall"
 
-	flag "github.com/spf13/pflag"
 	"github.com/f5devcentral/f5-ipam-controller/pkg/controller"
 	"github.com/f5devcentral/f5-ipam-controller/pkg/manager"
 	"github.com/f5devcentral/f5-ipam-controller/pkg/orchestration"
 	log "github.com/f5devcentral/f5-ipam-controller/pkg/vlogger"
 	clog "github.com/f5devcentral/f5-ipam-controller/pkg/vlogger/console"
+	flag "github.com/spf13/pflag"
 )
 
 const (
@@ -95,7 +95,6 @@ func verifyArgs() error {
 
 	*orch = strings.ToLower(*orch)
 	*provider = strings.ToLower(*provider)
-
 	if len(*iprange) == 0 && *provider == DefaultProvider {
 		return fmt.Errorf("IP Range not provider for Provider: %v", DefaultProvider)
 	}
@@ -127,9 +126,12 @@ func main() {
 		IPAMManagerParams: manager.IPAMManagerParams{Range: *iprange},
 	}
 	mgrParams.Range = *iprange
-	mgr := manager.NewManager(mgrParams)
+	mgr, err := manager.NewManager(mgrParams)
+	if err != nil {
+		log.Errorf("Unable to initialize manager: %v", err)
+		os.Exit(1)
+	}
 	stopCh := make(chan struct{})
-
 	ctlr := controller.NewController(
 		controller.Spec{
 			Orchestrator: orcr,

next-version.txt

@@ -1 +1 @@
-0.1.0
+0.1.1

pkg/manager/f5ipammanager.go

@@ -1,6 +1,7 @@
 package manager
 
 import (
+	"fmt"
 	"net"
 	"strings"
 
@@ -16,14 +17,13 @@ type IPAMManager struct {
 	provider *provider.IPAMProvider
 }
 
-func NewIPAMManager(params IPAMManagerParams) *IPAMManager {
+func NewIPAMManager(params IPAMManagerParams) (*IPAMManager, error) {
 	provParams := provider.Params{Range: params.Range}
 	prov := provider.NewProvider(provParams)
 	if prov == nil {
-		log.Error("[IPMG] Unable to create Provider")
-		return nil
+		return nil, fmt.Errorf("[IPMG] Unable to create Provider")
 	}
-	return &IPAMManager{provider: prov}
+	return &IPAMManager{provider: prov}, nil
 }
 
 // Creates an A record

pkg/manager/manager.go

@@ -1,6 +1,9 @@
 package manager
 
-import log "github.com/f5devcentral/f5-ipam-controller/pkg/vlogger"
+import (
+	"fmt"
+	log "github.com/f5devcentral/f5-ipam-controller/pkg/vlogger"
+)
 
 // Manager defines the interface that the IPAM system should implement
 type Manager interface {
@@ -25,7 +28,7 @@ type Params struct {
 	IPAMManagerParams
 }
 
-func NewManager(params Params) Manager {
+func NewManager(params Params) (Manager, error) {
 	switch params.Provider {
 	case F5IPAMProvider:
 		log.Debugf("[MGR] Creating Manager with Provider: %v", F5IPAMProvider)
@@ -34,5 +37,5 @@ func NewManager(params Params) Manager {
 	default:
 		log.Errorf("[MGR] Unknown Provider: %v", params.Provider)
 	}
-	return nil
+	return nil, fmt.Errorf("manager cannot be initialized")
 }