Fix OpenStack config issues

environs/openstack/config_test.go

 package openstack
 
 import (
         . "launchpad.net/gocheck"
         "launchpad.net/goyaml"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/environs/config"
         "os"
 )
 
 type ConfigSuite struct {
         savedVars map[string]string
 }
 
+// Ensure any environment variables a user may have set locally are reset.
 var envVars = map[string]string{
-        "OS_PASSWORD": "testpass",
+        "OS_USERNAME":     "",
+        "OS_PASSWORD":     "",
+        "OS_TENANT_NAME":  "",
+        "OS_AUTH_URL":     "",
+        "OS_REGION_NAME":  "",
+        "NOVA_USERNAME":   "",
+        "NOVA_PASSWORD":   "",
+        "NOVA_PROJECT_ID": "",
+        "NOVA_REGION":     "",
 }
 
 var _ = Suite(&ConfigSuite{})
 
 // configTest specifies a config parsing test, checking that env when
 // parsed as the openstack section of a config file matches
 // baseConfigResult when mutated by the mutate function, or that the
 // parse matches the given error.
 type configTest struct {
         summary       string
         config        attrs
         change        attrs
         region        string
         controlBucket string
         username      string
         password      string
         tenantName    string
         authURL       string
         firewallMode  config.FirewallMode
         err           string
 }
 
 type attrs map[string]interface{}
 
 func (t configTest) check(c *C) {
         envs := attrs{
                 "environments": attrs{
                         "testenv": attrs{
-                                "username":    "testuser",
-                                "tenant-name": "sometenant",
-                                "auth-url":    "http://somehost",
-                                "region":      "someregion",
-                                "type":        "openstack",
+                                "type": "openstack",
                         },
                 },
         }
         testenv := envs["environments"].(attrs)["testenv"].(attrs)
         for k, v := range t.config {
                 testenv[k] = v
         }
         if _, ok := testenv["control-bucket"]; !ok {
                 testenv["control-bucket"] = "x"
         }
@@ skipping 172 matching lines @@
         }, {
                 summary: "global firewall-mode",
                 config: attrs{
                         "firewall-mode": "global",
                 },
                 firewallMode: config.FwGlobal,
         },
 }
 
 func (s *ConfigSuite) TestConfig(c *C) {
+        s.setupEnvCredentials()
         for i, t := range configTests {
                 c.Logf("test %d: %s (%v)", i, t.summary, t.config)
                 t.check(c)
         }
 }
 
+func (s *ConfigSuite) setupEnvCredentials() {
+        os.Setenv("OS_USERNAME", "user")
+        os.Setenv("OS_PASSWORD", "secret")
+        os.Setenv("OS_AUTH_URL", "http://auth")
+        os.Setenv("OS_TENANT_NAME", "sometenant")
+        os.Setenv("OS_REGION_NAME", "region")
+}
+
+var regionTestConfig = configTests[0]
+var credentialsTestConfig = configTests[11]
+
+func (s *ConfigSuite) TestMissingRegion(c *C) {
+        s.setupEnvCredentials()
+        os.Setenv("OS_REGION_NAME", "")
+        os.Setenv("NOVA_REGION", "")
+        test := credentialsTestConfig
+        test.err = "required environment variable not set for credentials attribute: Region"
+        test.check(c)
+}
+
+func (s *ConfigSuite) TestMissingUsername(c *C) {
+        s.setupEnvCredentials()
+        os.Setenv("OS_USERNAME", "")
+        os.Setenv("NOVA_USERNAME", "")
+        test := regionTestConfig
+        test.err = "required environment variable not set for credentials attribute: User"
+        test.check(c)
+}
+
 func (s *ConfigSuite) TestMissingPassword(c *C) {
+        s.setupEnvCredentials()
         os.Setenv("OS_PASSWORD", "")
         os.Setenv("NOVA_PASSWORD", "")
-        test := configTests[0]
+        test := regionTestConfig
         test.err = "required environment variable not set for credentials attribute: Secrets"
         test.check(c)
 }
+func (s *ConfigSuite) TestMissingTenant(c *C) {
+        s.setupEnvCredentials()
+        os.Setenv("OS_TENANT_NAME", "")
+        os.Setenv("NOVA_PROJECT_ID", "")
+        test := regionTestConfig
+        test.err = "required environment variable not set for credentials attribute: TenantName"
+        test.check(c)
+}
+
+func (s *ConfigSuite) TestMissingAuthUrl(c *C) {
+        s.setupEnvCredentials()
+        os.Setenv("OS_AUTH_URL", "")
+        test := regionTestConfig
+        test.err = "required environment variable not set for credentials attribute: URL"
+        test.check(c)
+}
+
+func (s *ConfigSuite) TestCredentialsFromEnv(c *C) {
+        // Specify a basic configuration without credentials.
+        envs := attrs{
+                "environments": attrs{
+                        "testenv": attrs{
+                                "type": "openstack",
+                        },
+                },
+        }
+        data, err := goyaml.Marshal(envs)
+        c.Assert(err, IsNil)
+        // Poke the credentials into the environment.
+        s.setupEnvCredentials()
+        es, err := environs.ReadEnvironsBytes(data)
+        c.Check(err, IsNil)
+        e, err := es.Open("testenv")
+        ecfg := e.(*environ).ecfg()
+        // The credentials below come from environment variables set during test setup.
+        c.Assert(ecfg.username(), Equals, "user")
+        c.Assert(ecfg.password(), Equals, "secret")
+        c.Assert(ecfg.authURL(), Equals, "http://auth")
+        c.Assert(ecfg.region(), Equals, "region")
+        c.Assert(ecfg.tenantName(), Equals, "sometenant")
+}