Merge pull request #17 from 27149chen/improve_discoverydb_method

improve discoverydb method

Author: k8s-ci-robot

iscsi/iscsi.go

@@ -283,18 +283,20 @@ func Connect(c Connector) (string, error) {
 
 		if c.DoDiscovery {
 			// build discoverydb and discover iscsi target
-			if err := Discovery(p, iFace, c.DiscoverySecrets, c.DoCHAPDiscovery); err != nil {
+			if err := Discoverydb(p, iFace, c.DiscoverySecrets, c.DoCHAPDiscovery); err != nil {
 				debug.Printf("Error in discovery of the target: %s\n", err.Error())
 				lastErr = err
 				continue
 			}
 		}
 
-		// Make sure we don't log the secrets
-		err := CreateDBEntry(target.Iqn, p, iFace, c.DiscoverySecrets, c.SessionSecrets, c.DoCHAPDiscovery)
-		if err != nil {
-			debug.Printf("Error creating db entry: %s\n", err.Error())
-			continue
+		if c.DoCHAPDiscovery {
+			// Make sure we don't log the secrets
+			err := CreateDBEntry(target.Iqn, p, iFace, c.DiscoverySecrets, c.SessionSecrets)
+			if err != nil {
+				debug.Printf("Error creating db entry: %s\n", err.Error())
+				continue
+			}
 		}
 
 		// perform the login

iscsi/iscsiadm.go

@@ -88,11 +88,8 @@ func ShowInterface(iface string) (string, error) {
 }
 
 // CreateDBEntry sets up a node entry for the specified tgt in the nodes iscsi nodes db
-func CreateDBEntry(tgtIQN, portal, iFace string, discoverySecrets, sessionSecrets Secrets, chapDiscovery bool) error {
+func CreateDBEntry(tgtIQN, portal, iFace string, discoverySecrets, sessionSecrets Secrets) error {
 	debug.Println("Begin CreateDBEntry...")
-	if !chapDiscovery {
-		return nil
-	}
 	baseArgs := []string{"-m", "node", "-T", tgtIQN, "-p", portal}
 	_, err := iscsiCmd(append(baseArgs, []string{"-I", iFace, "-o", "new"}...)...)
 	if err != nil {
@@ -113,27 +110,17 @@ func CreateDBEntry(tgtIQN, portal, iFace string, discoverySecrets, sessionSecret
 
 }
 
-func updateISCSIDiscoverydb(tp, iface string, discoverySecrets Secrets) error {
-	baseArgs := []string{"-m", "discoverydb", "-t", "sendtargets", "-p", tp, "-I", iface}
-	_, err := iscsiCmd(append(baseArgs, []string{"-o", "update", "-n", "discovery.sendtargets.auth.authmethod", "-v", "CHAP"}...)...)
-	if err != nil {
-		return fmt.Errorf("failed to update discoverydb with CHAP, err: %v", err)
-	}
-
-	return createCHAPEntries(baseArgs, discoverySecrets, true)
-}
-
-// Discovery discover the iscsi target
-func Discovery(tp, iface string, discoverySecrets Secrets, chapDiscovery bool) error {
-	debug.Println("Begin Discovery...")
+// Discoverydb discovers the iscsi target
+func Discoverydb(tp, iface string, discoverySecrets Secrets, chapDiscovery bool) error {
+	debug.Println("Begin Discoverydb...")
 	baseArgs := []string{"-m", "discoverydb", "-t", "sendtargets", "-p", tp, "-I", iface}
 	out, err := iscsiCmd(append(baseArgs, []string{"-o", "new"}...)...)
 	if err != nil {
 		return fmt.Errorf("failed to create new entry of target in discoverydb, output: %v, err: %v", string(out), err)
 	}
 
 	if chapDiscovery {
-		if err := updateISCSIDiscoverydb(tp, iface, discoverySecrets); err != nil {
+		if err := createCHAPEntries(baseArgs, discoverySecrets, true); err != nil {
 			return err
 		}
 	}

iscsi/iscsiadm_test.go

@@ -65,9 +65,9 @@ iscsiadm: Could not perform SendTargets discovery.\n`,
 		t.Run(name, func(t *testing.T) {
 			mockedExitStatus = tt.mockedExitStatus
 			mockedStdout = tt.mockedStdout
-			err := Discovery(tt.tgtPortal, tt.iface, tt.discoverySecret, tt.chapDiscovery)
+			err := Discoverydb(tt.tgtPortal, tt.iface, tt.discoverySecret, tt.chapDiscovery)
 			if (err != nil) != tt.wantErr {
-				t.Errorf("Discovery() error = %v, wantErr %v", err, tt.wantErr)
+				t.Errorf("Discoverydb() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
 		})
@@ -82,19 +82,10 @@ func TestCreateDBEntry(t *testing.T) {
 		iface            string
 		discoverySecret  Secrets
 		sessionSecret    Secrets
-		chapDiscovery    bool
 		wantErr          bool
 		mockedStdout     string
 		mockedExitStatus int
 	}{
-		"CreateDBEntrySuccess": {
-			tgtPortal:        "192.168.1.107:3260",
-			tgtIQN:           "iqn.2010-10.org.openstack:volume-eb393993-73d0-4e39-9ef4-b5841e244ced",
-			iface:            "default",
-			chapDiscovery:    false,
-			mockedStdout:     nodeDB,
-			mockedExitStatus: 0,
-		},
 		"CreateDBEntryWithChapDiscoverySuccess": {
 			tgtPortal: "192.168.1.107:3260",
 			tgtIQN:    "iqn.2010-10.org.openstack:volume-eb393993-73d0-4e39-9ef4-b5841e244ced",
@@ -109,15 +100,13 @@ func TestCreateDBEntry(t *testing.T) {
 				PasswordIn:  "dummypass",
 				SecretsType: "chap",
 			},
-			chapDiscovery:    true,
 			mockedStdout:     nodeDB,
 			mockedExitStatus: 0,
 		},
 		"CreateDBEntryWithChapDiscoveryFailure": {
 			tgtPortal:        "172.18.0.2:3260",
 			tgtIQN:           "iqn.2016-09.com.openebs.jiva:store1",
 			iface:            "default",
-			chapDiscovery:    true,
 			mockedStdout:     "iscsiadm: No records found\n",
 			mockedExitStatus: 21,
 			wantErr:          true,
@@ -128,7 +117,7 @@ func TestCreateDBEntry(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			mockedExitStatus = tt.mockedExitStatus
 			mockedStdout = tt.mockedStdout
-			err := CreateDBEntry(tt.tgtIQN, tt.tgtPortal, tt.iface, tt.discoverySecret, tt.sessionSecret, tt.chapDiscovery)
+			err := CreateDBEntry(tt.tgtIQN, tt.tgtPortal, tt.iface, tt.discoverySecret, tt.sessionSecret)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("CreateDBEntry() error = %v, wantErr %v", err, tt.wantErr)
 				return