Merge pull request #610 from pramchan/my594

k8s-ci-robot · web-flow · commit 1ead08635cec · 2020-10-21T01:10:19.000-07:00
✨ My594 revised #590 #594 wrong parameter for a user provider network
diff --git a/controllers/openstackcluster_controller.go b/controllers/openstackcluster_controller.go
@@ -348,9 +348,12 @@ func (r *OpenStackClusterReconciler) reconcileNetworkComponents(log logr.Logger,
 
 		netOpts := networks.ListOpts(openStackCluster.Spec.Network)
 		networkList, err := networkingService.GetNetworksByFilter(&netOpts)
-		if err != nil && len(networkList) == 0 {
+		if err != nil {
 			return errors.Errorf("failed to find network: %v", err)
 		}
+		if len(networkList) == 0 {
+			return errors.Errorf("failed to find any network: %v", err)
+		}
 		if len(networkList) > 1 {
 			return errors.Errorf("failed to find only one network (result: %v): %v", networkList, err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -348,9 +348,12 @@ func (r *OpenStackClusterReconciler) reconcileNetworkComponents(log logr.Logger,`
`348`	`348`
`349`	`349`	`netOpts := networks.ListOpts(openStackCluster.Spec.Network)`
`350`	`350`	`networkList, err := networkingService.GetNetworksByFilter(&netOpts)`
`351`		`- if err != nil && len(networkList) == 0 {`
	`351`	`+ if err != nil {`
`352`	`352`	`return errors.Errorf("failed to find network: %v", err)`
`353`	`353`	`}`
	`354`	`+ if len(networkList) == 0 {`
	`355`	`+ return errors.Errorf("failed to find any network: %v", err)`
	`356`	`+ }`
`354`	`357`	`if len(networkList) > 1 {`
`355`	`358`	`return errors.Errorf("failed to find only one network (result: %v): %v", networkList, err)`
`356`	`359`	`}`