revert flag DoDiscoverydb in struct Connector

Lou · Lou · commit 9ab5bfe0523b · 2020-01-07T20:15:35.000+08:00
Signed-off-by: Lou &lt;luogj@cn.ibm.com&gt;
diff --git a/iscsi/iscsi.go b/iscsi/iscsi.go
@@ -52,7 +52,7 @@ type Connector struct {
 	Multipath        bool         `json:"multipath"`
 	RetryCount       int32        `json:"retry_count"`
 	CheckInterval    int32        `json:"check_interval"`
-	DoDiscoverydb    bool         `json:"do_discovery"`
+	DoDiscovery      bool         `json:"do_discovery"`
 	DoCHAPDiscovery  bool         `json:"do_chap_discovery"`
 }
 
@@ -281,7 +281,7 @@ func Connect(c Connector) (string, error) {
 			}
 		}
 
-		if c.DoDiscoverydb {
+		if c.DoDiscovery {
 			// build discoverydb and discover iscsi target
 			if err := Discoverydb(p, iFace, c.DiscoverySecrets, c.DoCHAPDiscovery); err != nil {
 				debug.Printf("Error in discovery of the target: %s\n", err.Error())

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ type Connector struct {`
`52`	`52`	Multipath bool `json:"multipath"`
`53`	`53`	RetryCount int32 `json:"retry_count"`
`54`	`54`	CheckInterval int32 `json:"check_interval"`
`55`		- DoDiscoverydb bool `json:"do_discovery"`
	`55`	+ DoDiscovery bool `json:"do_discovery"`
`56`	`56`	DoCHAPDiscovery bool `json:"do_chap_discovery"`
`57`	`57`	`}`
`58`	`58`
`@@ -281,7 +281,7 @@ func Connect(c Connector) (string, error) {`
`281`	`281`	`}`
`282`	`282`	`}`
`283`	`283`
`284`		`- if c.DoDiscoverydb {`
	`284`	`+ if c.DoDiscovery {`
`285`	`285`	`// build discoverydb and discover iscsi target`
`286`	`286`	`if err := Discoverydb(p, iFace, c.DiscoverySecrets, c.DoCHAPDiscovery); err != nil {`
`287`	`287`	`debug.Printf("Error in discovery of the target: %s\n", err.Error())`