Adding support for lbaas-v2 in OpenStack Cloud Provider

pkg/cloudprovider/providers/openstack/openstack_test.go

@@ -67,15 +67,15 @@ func TestReadConfig(t *testing.T) {
 	}
 
 	cfg, err := readConfig(strings.NewReader(`
-[Global]
-auth-url = http://auth.url
-username = user
-[LoadBalancer]
-create-monitor = yes
-monitor-delay = 1m
-monitor-timeout = 30s
-monitor-max-retries = 3
-`))
+ [Global]
+ auth-url = http://auth.url
+ username = user
+ [LoadBalancer]
+ create-monitor = yes
+ monitor-delay = 1m
+ monitor-timeout = 30s
+ monitor-max-retries = 3
+ `))
 	if err != nil {
 		t.Fatalf("Should succeed when a valid config is provided: %s", err)
 	}
@@ -204,6 +204,8 @@ func TestLoadBalancer(t *testing.T) {
 		t.Skipf("No config found in environment")
 	}
 
+	cfg.LoadBalancer.LBVersion = "v2"
+
 	os, err := newOpenStack(cfg)
 	if err != nil {
 		t.Fatalf("Failed to construct/authenticate OpenStack: %s", err)
@@ -223,6 +225,32 @@ func TestLoadBalancer(t *testing.T) {
 	}
 }
 
+func TestLoadBalancerV2(t *testing.T) {
+	cfg, ok := configFromEnv()
+	if !ok {
+		t.Skipf("No config found in environment")
+	}
+	cfg.LoadBalancer.LBVersion = "v2"
+
+	os, err := newOpenStack(cfg)
+	if err != nil {
+		t.Fatalf("Failed to construct/authenticate OpenStack: %s", err)
+	}
+
+	lbaas, ok := os.LoadBalancer()
+	if !ok {
+		t.Fatalf("LoadBalancer() returned false - perhaps your stack doesn't support Neutron?")
+	}
+
+	_, exists, err := lbaas.GetLoadBalancer(&api.Service{ObjectMeta: api.ObjectMeta{Name: "noexist"}})
+	if err != nil {
+		t.Fatalf("GetLoadBalancer(\"noexist\") returned error: %s", err)
+	}
+	if exists {
+		t.Fatalf("GetLoadBalancer(\"noexist\") returned exists")
+	}
+}
+
 func TestZones(t *testing.T) {
 	os := OpenStack{
 		provider: &gophercloud.ProviderClient{