Use exported constants for netconf commit-datastore values

Signed-off-by: Markus Vahlenkamp <markus.vahlenkamp@nokia.com>

Author: steiler

pkg/config/datastore.go

@@ -32,8 +32,8 @@ const (
 	sbiNETCONF = "netconf"
 	sbiGNMI    = "gnmi"
 
-	ncCommitDatastoreRunning   = "running"
-	ncCommitDatastoreCandidate = "candidate"
+	NcCommitDatastoreRunning   = "running"
+	NcCommitDatastoreCandidate = "candidate"
 )
 
 type DatastoreConfig struct {
@@ -189,12 +189,12 @@ func (s *SBI) validateSetDefaults() error {
 	case sbiNETCONF:
 		switch s.NetconfOptions.CommitDatastore {
 		case "":
-			s.NetconfOptions.CommitDatastore = ncCommitDatastoreCandidate
-		case ncCommitDatastoreRunning:
-		case ncCommitDatastoreCandidate:
+			s.NetconfOptions.CommitDatastore = NcCommitDatastoreCandidate
+		case NcCommitDatastoreRunning:
+		case NcCommitDatastoreCandidate:
 		default:
 			return fmt.Errorf("unknown commit-datastore: %s. Must be one of %s, %s",
-				s.NetconfOptions.CommitDatastore, ncCommitDatastoreCandidate, ncCommitDatastoreRunning)
+				s.NetconfOptions.CommitDatastore, NcCommitDatastoreCandidate, NcCommitDatastoreRunning)
 		}
 	case sbiGNMI:
 		if s.GnmiOptions.Encoding == "" {

pkg/core/datastore.go

@@ -129,7 +129,7 @@ func targetFromSBI(s *config.SBI) api.Target {
 	}
 	if o := s.NetconfOptions; o != nil {
 		commit := api.CommitCandidateCandidate
-		if o.CommitDatastore == "running" {
+		if o.CommitDatastore == config.NcCommitDatastoreRunning {
 			commit = api.CommitCandidateRunning
 		}
 		t.ProtocolOptions.Netconf = &api.NetconfOptions{

pkg/datastore/target/netconf/nc.go

@@ -165,7 +165,7 @@ func (t *ncTarget) Set(ctx context.Context, source types.TargetSource) (*sdcpb.S
 	}
 
 	switch t.sbiConfig.NetconfOptions.CommitDatastore {
-	case "running", "candidate":
+	case config.NcCommitDatastoreRunning, config.NcCommitDatastoreCandidate:
 		return t.setToDevice(ctx, t.sbiConfig.NetconfOptions.CommitDatastore, source)
 	}
 	// should not get here if the config validation happened.
@@ -274,7 +274,7 @@ func (t *ncTarget) setToDevice(ctx context.Context, commitDatastore string, sour
 		}
 
 		// candidate should discard on error
-		if commitDatastore == "candidate" {
+		if commitDatastore == config.NcCommitDatastoreCandidate {
 			err2 := t.driver.Discard()
 			if err2 != nil {
 				// log failed discard
@@ -289,7 +289,7 @@ func (t *ncTarget) setToDevice(ctx context.Context, commitDatastore string, sour
 	}
 
 	// candidate stores need to commit the changes to running
-	if commitDatastore == "candidate" {
+	if commitDatastore == config.NcCommitDatastoreCandidate {
 		log.Info("committing changes on target")
 		// commit the config
 		err = t.driver.Commit()

pkg/server/datastore.go

@@ -108,11 +108,11 @@ func (s *Server) CreateDataStore(ctx context.Context, req *sdcpb.CreateDataStore
 	switch strings.ToLower(reqTarget.GetType()) {
 	case "netconf":
 		netconfOpts := reqTarget.GetNetconfOpts()
-		commitDatastore := "candidate"
+		commitDatastore := config.NcCommitDatastoreCandidate
 		switch netconfOpts.GetCommitCandidate() {
 		case sdcpb.CommitCandidate_COMMIT_CANDIDATE:
 		case sdcpb.CommitCandidate_COMMIT_RUNNING:
-			commitDatastore = "running"
+			commitDatastore = config.NcCommitDatastoreRunning
 		default:
 			log.Error(nil, "unknown commitDatastore", "datastore", netconfOpts.GetCommitCandidate())
 			return nil, fmt.Errorf("unknown commitDatastore: %v", netconfOpts.GetCommitCandidate())