From b59bff685223bcb8c8b240fa8947bb0a6a7166b1 Mon Sep 17 00:00:00 2001
From: Ole Markus With <olemarkus@gmail.com>
Date: Thu, 8 Dec 2022 10:08:22 +0100
Subject: [PATCH] Create integration test for OS with Octavia

---
 .../expected-v1alpha2.yaml                    | 21 +++++++++++++++----
 .../ha_openstack_octavia/options.yaml         |  6 +++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml
index e3540b18ba..7f2efd1579 100644
--- a/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml
@@ -4,6 +4,9 @@ metadata:
   creationTimestamp: "2017-01-01T00:00:00Z"
   name: minimal.k8s.local
 spec:
+  api:
+    loadBalancer:
+      type: Public
   authorization:
     rbac: {}
   channel: stable
@@ -12,12 +15,18 @@ spec:
       blockStorage:
         bs-version: v3
         ignore-volume-az: false
+      loadbalancer:
+        floatingNetwork: vlan1
+        method: ROUND_ROBIN
+        provider: octavia
+        useOctavia: true
       monitor:
         delay: 15s
         maxRetries: 3
         timeout: 10s
       router:
-        externalNetwork: ""
+        dnsServers: 1.1.1.1
+        externalNetwork: vlan1
   cloudProvider: openstack
   configBase: memfs://tests/minimal.k8s.local
   etcdClusters:
@@ -60,13 +69,17 @@ spec:
   subnets:
   - cidr: 10.0.32.0/19
     name: us-test1
-    type: Public
+    type: Private
+    zone: us-test1
+  - cidr: 10.0.0.0/22
+    name: utility-us-test1
+    type: Utility
     zone: us-test1
   topology:
     dns:
       type: Private
-    masters: public
-    nodes: public
+    masters: private
+    nodes: private
 
 ---
 
diff --git a/tests/integration/create_cluster/ha_openstack_octavia/options.yaml b/tests/integration/create_cluster/ha_openstack_octavia/options.yaml
index 1d9627e779..e25a02ba25 100644
--- a/tests/integration/create_cluster/ha_openstack_octavia/options.yaml
+++ b/tests/integration/create_cluster/ha_openstack_octavia/options.yaml
@@ -7,4 +7,8 @@ NetworkCIDR: 10.0.0.0/16
 Networking: cni
 Zones:
   - us-test1
-Octavia: true
\ No newline at end of file
+OpenstackLBOctavia: true
+OpenstackExternalNet: vlan1
+OpenstackDNSServers: 1.1.1.1
+APILoadBalancerType: public
+Topology: private
\ No newline at end of file