|
7 | 7 | "github.com/gophercloud/gophercloud/v2" |
8 | 8 | "github.com/gophercloud/gophercloud/v2/openstack" |
9 | 9 | "github.com/gophercloud/gophercloud/v2/openstack/config/clouds" |
10 | | - ini "gopkg.in/ini.v1" |
11 | 10 |
|
12 | 11 | g "github.com/onsi/ginkgo/v2" |
13 | 12 | o "github.com/onsi/gomega" |
@@ -192,29 +191,18 @@ var _ = g.Describe("[sig-installer][Suite:openshift/openstack] The Openshift", f |
192 | 191 | o.Expect(role.Rules[0].ResourceNames[0]).To(o.Equal(expectedSecretName), |
193 | 192 | "Unexpected resourceName on role %q in %q namespace", openstackCredsRole, systemNamespace) |
194 | 193 |
|
195 | | - g.By(fmt.Sprintf("Getting the openstack auth url from clouds.conf in secret %q in %q namespace", |
196 | | - expectedSecretName, systemNamespace)) |
| 194 | + g.By(fmt.Sprintf("Getting the credentials secret %q in %q namespace", expectedSecretName, systemNamespace)) |
197 | 195 | secret, err := clientSet.CoreV1().Secrets(systemNamespace).Get(ctx, expectedSecretName, metav1.GetOptions{}) |
198 | 196 | o.Expect(err).NotTo(o.HaveOccurred(), "Secret %q not found in %q namespace", expectedSecretName, systemNamespace) |
199 | | - conf, err := ini.Load([]byte(secret.Data["clouds.conf"])) |
200 | | - o.Expect(err).NotTo(o.HaveOccurred(), |
201 | | - "clouds.conf key not found on %q secret in %q namespace", expectedSecretName, systemNamespace) |
202 | | - globalSection, err := conf.GetSection("Global") |
203 | | - o.Expect(err).NotTo(o.HaveOccurred(), |
204 | | - "section Global not found on %q secret in %q namespace", expectedSecretName, systemNamespace) |
205 | | - authUrl, err := globalSection.GetKey("auth-url") |
206 | | - o.Expect(err).NotTo(o.HaveOccurred(), |
207 | | - "property auth-url not found on %q secret in %q namespace", expectedSecretName, systemNamespace) |
208 | 197 |
|
209 | | - g.By(fmt.Sprintf("Getting the openstack auth url from clouds.yaml in secret %q in %q namespace", expectedSecretName, systemNamespace)) |
| 198 | + g.By(fmt.Sprintf("Unmarshalling the clouds.yaml extracted from secret %q in %q namespace", expectedSecretName, systemNamespace)) |
210 | 199 | cloudsYaml := make(map[string]map[string]*clouds.Cloud) |
211 | 200 | err = yaml.Unmarshal([]byte(secret.Data["clouds.yaml"]), &cloudsYaml) |
212 | 201 | o.Expect(err).NotTo(o.HaveOccurred(), |
213 | 202 | "Error unmarshaling clouds.yaml on %q secret in %q namespace", expectedSecretName, systemNamespace) |
214 | 203 | clouds := cloudsYaml["clouds"]["openstack"] |
215 | 204 |
|
216 | 205 | g.By("Compare cloud auth url on secret with openstack API") |
217 | | - o.Expect(computeClient.IdentityEndpoint).To(o.HavePrefix(authUrl.Value()), "Unexpected auth url on clouds.conf") |
218 | 206 | o.Expect(computeClient.IdentityEndpoint).To(o.HavePrefix(clouds.AuthInfo.AuthURL), "Unexpected auth url on clouds.yaml") |
219 | 207 |
|
220 | 208 | }) |
|
0 commit comments