From 5f457eaea8f0b21dac23bedba832906dde426e36 Mon Sep 17 00:00:00 2001
From: anton-sidelnikov <a.sidelnikov@t-systems.com>
Date: Wed, 17 May 2023 17:28:39 +0200
Subject: [PATCH 1/6] waf premium instance operations

---
 acceptance/clients/clients.go                 |  9 ++
 .../openstack/waf-premium/v1/helpers.go       | 25 ++++++
 .../openstack/waf-premium/v1/instance_test.go | 72 ++++++++++++++++
 openstack/client.go                           | 10 +++
 openstack/waf-premium/v1/instances/Create.go  | 82 ++++++++++++++++++
 openstack/waf-premium/v1/instances/Delete.go  | 12 +++
 openstack/waf-premium/v1/instances/Get.go     | 84 +++++++++++++++++++
 openstack/waf-premium/v1/instances/List.go    | 30 +++++++
 openstack/waf-premium/v1/instances/Update.go  | 30 +++++++
 openstack/waf-premium/v1/instances/Upgrade.go | 36 ++++++++
 10 files changed, 390 insertions(+)
 create mode 100644 acceptance/openstack/waf-premium/v1/helpers.go
 create mode 100644 acceptance/openstack/waf-premium/v1/instance_test.go
 create mode 100644 openstack/waf-premium/v1/instances/Create.go
 create mode 100644 openstack/waf-premium/v1/instances/Delete.go
 create mode 100644 openstack/waf-premium/v1/instances/Get.go
 create mode 100644 openstack/waf-premium/v1/instances/List.go
 create mode 100644 openstack/waf-premium/v1/instances/Update.go
 create mode 100644 openstack/waf-premium/v1/instances/Upgrade.go

diff --git a/acceptance/clients/clients.go b/acceptance/clients/clients.go
index 741710de4..624f8a407 100644
--- a/acceptance/clients/clients.go
+++ b/acceptance/clients/clients.go
@@ -526,6 +526,15 @@ func NewWafV1Client() (*golangsdk.ServiceClient, error) {
 	return openstack.NewWAFV1(cc.ProviderClient, golangsdk.EndpointOpts{Region: cc.RegionName})
 }
 
+// NewWafPremiumV1Client returns authenticated WAF premium v1 client
+func NewWafPremiumV1Client() (*golangsdk.ServiceClient, error) {
+	cc, err := CloudAndClient()
+	if err != nil {
+		return nil, err
+	}
+	return openstack.NewWAFPremiumV1(cc.ProviderClient, golangsdk.EndpointOpts{Region: cc.RegionName})
+}
+
 // NewCsbsV1Client returns authenticated CSBS v1 client
 func NewCsbsV1Client() (*golangsdk.ServiceClient, error) {
 	cc, err := CloudAndClient()
diff --git a/acceptance/openstack/waf-premium/v1/helpers.go b/acceptance/openstack/waf-premium/v1/helpers.go
new file mode 100644
index 000000000..d40e57862
--- /dev/null
+++ b/acceptance/openstack/waf-premium/v1/helpers.go
@@ -0,0 +1,25 @@
+package v1
+
+import (
+	"fmt"
+
+	golangsdk "github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud/openstack/waf-premium/v1/instances"
+)
+
+func waitForInstanceToBeCreated(client *golangsdk.ServiceClient, secs int, id string) error {
+	return golangsdk.WaitFor(secs, func() (bool, error) {
+		instance, err := instances.Get(client, id)
+		if err != nil {
+			return false, err
+		}
+		if instance.Status == 1 {
+			return true, nil
+		}
+		if instance.Status == 4 {
+			return false, fmt.Errorf("error creating instance")
+		}
+
+		return false, nil
+	})
+}
diff --git a/acceptance/openstack/waf-premium/v1/instance_test.go b/acceptance/openstack/waf-premium/v1/instance_test.go
new file mode 100644
index 000000000..efbd81aaf
--- /dev/null
+++ b/acceptance/openstack/waf-premium/v1/instance_test.go
@@ -0,0 +1,72 @@
+package v1
+
+import (
+	"os"
+	"testing"
+
+	golangsdk "github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud/acceptance/clients"
+	"github.com/opentelekomcloud/gophertelekomcloud/acceptance/openstack"
+	"github.com/opentelekomcloud/gophertelekomcloud/acceptance/tools"
+	"github.com/opentelekomcloud/gophertelekomcloud/openstack/waf-premium/v1/instances"
+	th "github.com/opentelekomcloud/gophertelekomcloud/testhelper"
+)
+
+func TestWafPremiumInstanceWorkflow(t *testing.T) {
+	client, err := clients.NewWafPremiumV1Client()
+	th.AssertNoErr(t, err)
+
+	instanceId := createInstance(t, client)
+	th.AssertNoErr(t, waitForInstanceToBeCreated(client, 600, instanceId))
+
+	t.Cleanup(func() {
+		t.Logf("Attempting to delete WAF Premium instance: %s", instanceId)
+		th.AssertNoErr(t, instances.Delete(client, instanceId))
+		t.Logf("Deleted WAF Premium instance: %s", instanceId)
+	})
+
+	instance, err := instances.Get(client, instanceId)
+	th.AssertNoErr(t, err)
+	th.AssertEquals(t, instance.ID, instanceId)
+
+	instancesList, err := instances.List(client, instances.ListOpts{})
+	th.AssertNoErr(t, err)
+
+	if len(instancesList) < 1 {
+		t.Fatal("empty WAF instances list")
+	}
+	updatedName := tools.RandomString("waf-instance-updated-", 3)
+	instanceUpdated, err := instances.Update(client, instanceId, instances.UpdateOpts{
+		Name: updatedName,
+	})
+	th.AssertEquals(t, instanceUpdated.Name, updatedName)
+}
+
+func createInstance(t *testing.T, client *golangsdk.ServiceClient) string {
+	t.Logf("Attempting to create WAF premium instance")
+
+	region := os.Getenv("OS_REGION_NAME")
+	az := os.Getenv("OS_AVAILABILITY_ZONE")
+	vpcID := os.Getenv("OS_VPC_ID")
+	subnetID := os.Getenv("OS_NETWORK_ID")
+	if vpcID == "" && subnetID == "" && region == "" && az == "" {
+		t.Skip("OS_REGION_NAME, OS_AVAILABILITY_ZONE, OS_VPC_ID and OS_NETWORK_ID env vars is required for this test")
+	}
+
+	opts := instances.CreateOpts{
+		Count:            1,
+		Region:           region,
+		AvailabilityZone: az,
+		Architecture:     "x86_64",
+		InstanceName:     tools.RandomString("waf-instance-", 3),
+		Specification:    "waf.instance.enterprise",
+		Flavor:           "s3.2xlarge.2",
+		VpcId:            vpcID,
+		SubnetId:         subnetID,
+		SecurityGroupsId: []string{openstack.DefaultSecurityGroup(t)},
+	}
+	inst, err := instances.Create(client, opts)
+	th.AssertNoErr(t, err)
+	t.Logf("Created WAF instance: %s", inst.Instances[0].Id)
+	return inst.Instances[0].Id
+}
diff --git a/openstack/client.go b/openstack/client.go
index 403ba9ae3..a19e38aad 100644
--- a/openstack/client.go
+++ b/openstack/client.go
@@ -859,6 +859,16 @@ func NewWAFV1(client *golangsdk.ProviderClient, eo golangsdk.EndpointOpts) (*gol
 	return sc, err
 }
 
+// NewWAFPremiumV1 creates a ServiceClient that may be used to access the premium WAF service.
+func NewWAFPremiumV1(client *golangsdk.ProviderClient, eo golangsdk.EndpointOpts) (*golangsdk.ServiceClient, error) {
+	sc, err := initClientOpts(client, eo, "waf")
+	if err != nil {
+		return nil, err
+	}
+	sc.ResourceBase = sc.Endpoint + "v1/" + client.ProjectID + "/premium-waf/"
+	return sc, err
+}
+
 // NewRDSV3 creates a ServiceClient that may be used to access the RDS service.
 func NewRDSV3(client *golangsdk.ProviderClient, eo golangsdk.EndpointOpts) (*golangsdk.ServiceClient, error) {
 	return initClientOpts(client, eo, "rdsv3")
diff --git a/openstack/waf-premium/v1/instances/Create.go b/openstack/waf-premium/v1/instances/Create.go
new file mode 100644
index 000000000..81fee869b
--- /dev/null
+++ b/openstack/waf-premium/v1/instances/Create.go
@@ -0,0 +1,82 @@
+package instances
+
+import (
+	"github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/build"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/extract"
+)
+
+type CreateOpts struct {
+	// Billing mode. Currently, only pay-per-use billing (30) is
+	// supported. Make sure your account balance is enough, or
+	// the dedicated WAF engine will forward requests directly to
+	// the origin server without inspection.
+	ChargeMode int `json:"chargemode"`
+	// Region where a dedicated engine is to be created. Its
+	// value is EU-DE.
+	Region string `json:"region" required:"true"`
+	// AZ where the dedicated engine is to be created.
+	AvailabilityZone string `json:"available_zone" required:"true"`
+	// Dedicated engine CPU architecture. Its value can be x86.
+	Architecture string `json:"arch" required:"true"`
+	// Prefix of the dedicated WAF engine name, which is user-defined
+	InstanceName string `json:"instancename" required:"true"`
+	// Specification of the dedicated engine version. The value can be
+	// waf.instance.enterprise or waf.instance.professional. An
+	// enterprise edition dedicated engine has more functions
+	// than a professional edition one. For more details, see the
+	// Web Application Firewall (WAF) User Guide
+	Specification string `json:"specification" required:"true"`
+	// ID of the specification of the ECS hosting the dedicated
+	// engine. It can be obtained by calling the ECS ListFlavors API.
+	// For the enterprise edition, ECS specification with 8 vCPUs
+	// and 16 GB memory are used. For the professional edition,
+	// ECS specification with 2 vCPUs and 4 GB memory are used.
+	Flavor string `json:"cpu_flavor" required:"true"`
+	// ID of the VPC where the dedicated engine is located. It
+	// can be obtained by calling the ListVpcs API.
+	VpcId string `json:"vpc_id" required:"true"`
+	// ID of the VPC subnet where the dedicated engine is
+	// located. It can be obtained by calling the ListSubnets API.
+	// subnet_id has the same value as network_id obtained by
+	// calling the OpenStack APIs.
+	SubnetId string `json:"subnet_id" required:"true"`
+	// ID of the security group where  the dedicated engine is
+	// located. It can be obtained by calling the ListSecurityGroups API.
+	SecurityGroupsId []string `json:"security_group" required:"true"`
+	// Number of dedicated engines to be provisioned
+	Count int `json:"count" required:"true"`
+}
+
+// Create will create a new instance on the values in CreateOpts. To extract
+// the instance object from the response, call the Extract method on the CreateResult.
+func Create(client *golangsdk.ServiceClient, opts CreateOpts) (*InstanceResponse, error) {
+	b, err := build.RequestBody(opts, "")
+	if err != nil {
+		return nil, err
+	}
+
+	// POST /v1/{project_id}/premium-waf/instance
+	raw, err := client.Post(client.ServiceURL("instance"), b,
+		nil, &golangsdk.RequestOpts{
+			OkCodes: []int{201},
+		})
+	if err != nil {
+		return nil, err
+	}
+
+	var res InstanceResponse
+	err = extract.Into(raw.Body, &res)
+	return &res, err
+}
+
+type InstanceResponse struct {
+	Instances []Info `json:"instances"`
+}
+
+type Info struct {
+	// Instance id
+	Id string `json:"id"`
+	// Instance name
+	Name string `json:"name"`
+}
diff --git a/openstack/waf-premium/v1/instances/Delete.go b/openstack/waf-premium/v1/instances/Delete.go
new file mode 100644
index 000000000..17ad2d2ac
--- /dev/null
+++ b/openstack/waf-premium/v1/instances/Delete.go
@@ -0,0 +1,12 @@
+package instances
+
+import (
+	"github.com/opentelekomcloud/gophertelekomcloud"
+)
+
+func Delete(client *golangsdk.ServiceClient, id string) (err error) {
+	_, err = client.Delete(client.ServiceURL("instance", id), &golangsdk.RequestOpts{
+		OkCodes: []int{200},
+	})
+	return
+}
diff --git a/openstack/waf-premium/v1/instances/Get.go b/openstack/waf-premium/v1/instances/Get.go
new file mode 100644
index 000000000..38495cf03
--- /dev/null
+++ b/openstack/waf-premium/v1/instances/Get.go
@@ -0,0 +1,84 @@
+package instances
+
+import (
+	"github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/extract"
+)
+
+func Get(client *golangsdk.ServiceClient, id string) (*Instance, error) {
+	// GET /v1/{project_id}/premium-waf/instance
+	raw, err := client.Get(client.ServiceURL("instance", id), nil, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var res Instance
+	return &res, extract.Into(raw.Body, &res)
+}
+
+type Instance struct {
+	// ID of the dedicated WAF engine.
+	ID string `json:"id"`
+	// Name of the dedicated WAF engine.
+	Name string `json:"instance_name"`
+	// Region where a dedicated engine is to be created. Its value is EU-DE.
+	Region string `json:"region"`
+	// Az ID.
+	AvailabilityZone string `json:"zone"`
+	// CPU architecture.
+	Architecture string `json:"arch"`
+	// ECS specification ID.
+	Flavor string `json:"cpu_flavor"`
+	// ID of the VPC where the dedicated engine is located.
+	VpcID string `json:"vpc_id"`
+	// Subnet ID of the VPC where the dedicated engine is located.
+	SubnetId string `json:"subnet_id"`
+	// Service plane IP address of the dedicated engine.
+	ServiceIp string `json:"service_ip"`
+	// IPv6 address of the service plane of the dedicated engine.
+	ServiceIpv6 string `json:"service_ipv6"`
+	// Security groups bound to the dedicated engine ECS.
+	SecurityGroups []string `json:"security_group_ids"`
+	// Billing status of dedicated WAF engine. The value can be 0, 1, or 2.
+	// 0: The billing is normal.
+	// 1: The billing account is frozen. Resources
+	// and data will be retained, but the cloud
+	// services cannot be used by the account.
+	// 2: The billing is terminated. Resources and data will be cleared.
+	BillingStatus int `json:"status"`
+	// Running status of the dedicated engine. The value can be:
+	// 0 (creating)
+	// 1 (running)
+	// 2 (deleting)
+	// 3 (deleted)
+	// 4 (creation failed)
+	// 5 (frozen)
+	// 6 (abnormal)
+	// 7 (updating)
+	// 8 (update failed).
+	Status int `json:"run_status"`
+	// Access status of the dedicated engine. The value can be 0 or 1.
+	// 0: the dedicated engine is not connected.
+	// 1: the dedicated engine is connected.
+	AccessStatus int `json:"access_status"`
+	// Whether the dedicated engine can be upgraded.
+	// The value can be 0 for no or 1 for yes.
+	Upgradable int `json:"upgradable"`
+	// Dedicated engine ECS specification for example,
+	// 8 vCPUs | 16 GB.
+	Specification string `json:"specification"`
+	// Domain name protected by the dedicated engine.
+	Hosts []HostEntry `json:"hosts"`
+	// ID of the ECS hosting the dedicated engine.
+	ServerId string `json:"server_id"`
+	// Timestamp when the dedicated WAF engine was created.
+	CreatedAt int64 `json:"create_time"`
+}
+
+type HostEntry struct {
+	// ID of the protected domain name. This is a
+	// unique ID automatically generated by the system.
+	ID string `json:"id"`
+	// Protected domain name
+	Hostname string `json:"hostname"`
+}
diff --git a/openstack/waf-premium/v1/instances/List.go b/openstack/waf-premium/v1/instances/List.go
new file mode 100644
index 000000000..d2047e27e
--- /dev/null
+++ b/openstack/waf-premium/v1/instances/List.go
@@ -0,0 +1,30 @@
+package instances
+
+import (
+	golangsdk "github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/extract"
+)
+
+func List(client *golangsdk.ServiceClient, opts ListOpts) ([]Instance, error) {
+	// GET /v1/{project_id}/premium-waf/instance
+	query, err := golangsdk.BuildQueryString(opts)
+	if err != nil {
+		return nil, err
+	}
+
+	url := client.ServiceURL("instance") + query.String()
+	raw, err := client.Get(url, nil, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var res []Instance
+	err = extract.IntoSlicePtr(raw.Body, &res, "items")
+	return res, err
+}
+
+type ListOpts struct {
+	// Fuzzy query for dedicated WAF engine names.
+	// Only Prefix and Suffix match query are supported
+	Name string `json:"instancename"`
+}
diff --git a/openstack/waf-premium/v1/instances/Update.go b/openstack/waf-premium/v1/instances/Update.go
new file mode 100644
index 000000000..a60bc8af5
--- /dev/null
+++ b/openstack/waf-premium/v1/instances/Update.go
@@ -0,0 +1,30 @@
+package instances
+
+import (
+	"github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/build"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/extract"
+)
+
+type UpdateOpts struct {
+	// New name of the dedicated WAF engine
+	Name string `json:"instancename" required:"true"`
+}
+
+func Update(client *golangsdk.ServiceClient, id string, opts UpdateOpts) (*Instance, error) {
+	b, err := build.RequestBody(opts, "")
+	if err != nil {
+		return nil, err
+	}
+
+	// PUT /v1/{project_id}/premium-waf/instance
+	raw, err := client.Put(client.ServiceURL("instance", id), b, nil, &golangsdk.RequestOpts{
+		OkCodes: []int{200},
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	var res Instance
+	return &res, extract.Into(raw.Body, &res)
+}
diff --git a/openstack/waf-premium/v1/instances/Upgrade.go b/openstack/waf-premium/v1/instances/Upgrade.go
new file mode 100644
index 000000000..745d30f37
--- /dev/null
+++ b/openstack/waf-premium/v1/instances/Upgrade.go
@@ -0,0 +1,36 @@
+package instances
+
+import (
+	"github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/build"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/extract"
+)
+
+type UpgradeOpts struct {
+	// Operation name.
+	// upgrade: Upgrade the	software version of the dedicated WAF engine
+	Action string `json:"action"`
+}
+
+// Upgrade will create a new instance on the values in CreateOpts. To extract
+// the instance object from the response, call the Extract method on the CreateResult.
+func Upgrade(client *golangsdk.ServiceClient, id string) (*Instance, error) {
+	b, err := build.RequestBody(UpgradeOpts{
+		Action: "upgrade",
+	}, "")
+	if err != nil {
+		return nil, err
+	}
+
+	// POST /v1/{project_id}/premium-waf/instance
+	raw, err := client.Post(client.ServiceURL("instance", id, "action"), b,
+		nil, &golangsdk.RequestOpts{
+			OkCodes: []int{200},
+		})
+	if err != nil {
+		return nil, err
+	}
+
+	var res Instance
+	return &res, extract.Into(raw.Body, &res)
+}

From 6bc78aa90c0950cebb862a8dd647856c2b8bd274 Mon Sep 17 00:00:00 2001
From: anton-sidelnikov <a.sidelnikov@t-systems.com>
Date: Wed, 17 May 2023 17:35:29 +0200
Subject: [PATCH 2/6] skip

---
 acceptance/openstack/waf-premium/v1/instance_test.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/acceptance/openstack/waf-premium/v1/instance_test.go b/acceptance/openstack/waf-premium/v1/instance_test.go
index efbd81aaf..bb37044ea 100644
--- a/acceptance/openstack/waf-premium/v1/instance_test.go
+++ b/acceptance/openstack/waf-premium/v1/instance_test.go
@@ -39,6 +39,7 @@ func TestWafPremiumInstanceWorkflow(t *testing.T) {
 	instanceUpdated, err := instances.Update(client, instanceId, instances.UpdateOpts{
 		Name: updatedName,
 	})
+	th.AssertNoErr(t, err)
 	th.AssertEquals(t, instanceUpdated.Name, updatedName)
 }
 
@@ -52,6 +53,11 @@ func createInstance(t *testing.T, client *golangsdk.ServiceClient) string {
 	if vpcID == "" && subnetID == "" && region == "" && az == "" {
 		t.Skip("OS_REGION_NAME, OS_AVAILABILITY_ZONE, OS_VPC_ID and OS_NETWORK_ID env vars is required for this test")
 	}
+	// to be deleted
+	if region != "eu-ch2" {
+		t.Skip("this service deployed only in SWISS region for now")
+	}
+	//
 
 	opts := instances.CreateOpts{
 		Count:            1,

From b96c918aeb850d6eb943002addbcc87e8572f65a Mon Sep 17 00:00:00 2001
From: anton-sidelnikov <a.sidelnikov@t-systems.com>
Date: Mon, 5 Jun 2023 10:57:32 +0200
Subject: [PATCH 3/6] delete

---
 acceptance/openstack/waf-premium/v1/helpers.go      | 13 +++++++++++++
 .../openstack/waf-premium/v1/instance_test.go       |  1 +
 openstack/waf-premium/v1/instances/Delete.go        |  3 ++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/acceptance/openstack/waf-premium/v1/helpers.go b/acceptance/openstack/waf-premium/v1/helpers.go
index d40e57862..a77ee59fc 100644
--- a/acceptance/openstack/waf-premium/v1/helpers.go
+++ b/acceptance/openstack/waf-premium/v1/helpers.go
@@ -23,3 +23,16 @@ func waitForInstanceToBeCreated(client *golangsdk.ServiceClient, secs int, id st
 		return false, nil
 	})
 }
+
+func waitForInstanceToBeDeleted(client *golangsdk.ServiceClient, secs int, id string) error {
+	return golangsdk.WaitFor(secs, func() (bool, error) {
+		_, err := instances.Get(client, id)
+		if err != nil {
+			if _, ok := err.(golangsdk.ErrDefault404); ok {
+				return true, nil
+			}
+			return false, fmt.Errorf("error retriving WAF instance status: %w", err)
+		}
+		return false, nil
+	})
+}
diff --git a/acceptance/openstack/waf-premium/v1/instance_test.go b/acceptance/openstack/waf-premium/v1/instance_test.go
index bb37044ea..b6e2a3a8a 100644
--- a/acceptance/openstack/waf-premium/v1/instance_test.go
+++ b/acceptance/openstack/waf-premium/v1/instance_test.go
@@ -22,6 +22,7 @@ func TestWafPremiumInstanceWorkflow(t *testing.T) {
 	t.Cleanup(func() {
 		t.Logf("Attempting to delete WAF Premium instance: %s", instanceId)
 		th.AssertNoErr(t, instances.Delete(client, instanceId))
+		th.AssertNoErr(t, waitForInstanceToBeDeleted(client, 600, instanceId))
 		t.Logf("Deleted WAF Premium instance: %s", instanceId)
 	})
 
diff --git a/openstack/waf-premium/v1/instances/Delete.go b/openstack/waf-premium/v1/instances/Delete.go
index 17ad2d2ac..f2994b24b 100644
--- a/openstack/waf-premium/v1/instances/Delete.go
+++ b/openstack/waf-premium/v1/instances/Delete.go
@@ -6,7 +6,8 @@ import (
 
 func Delete(client *golangsdk.ServiceClient, id string) (err error) {
 	_, err = client.Delete(client.ServiceURL("instance", id), &golangsdk.RequestOpts{
-		OkCodes: []int{200},
+		OkCodes:     []int{200},
+		MoreHeaders: map[string]string{"Content-Type": "application/json;charset=utf8"},
 	})
 	return
 }

From 9b07bcb60f95311f10b7063d941683fdab095480 Mon Sep 17 00:00:00 2001
From: Anton Sidelnikov <53078276+anton-sidelnikov@users.noreply.github.com>
Date: Fri, 9 Jun 2023 12:36:51 +0200
Subject: [PATCH 4/6] [WAF] Hosts support for dedicated version (works only in
 eu-ch2) (#533)

* waf dedicated hosts

* minor fixes

* timestamp type
---
 .../openstack/waf-premium/v1/host_test.go     |  80 ++++++++
 openstack/waf-premium/v1/hosts/Create.go      | 175 ++++++++++++++++++
 openstack/waf-premium/v1/hosts/Delete.go      |  21 +++
 openstack/waf-premium/v1/hosts/Get.go         |  78 ++++++++
 openstack/waf-premium/v1/hosts/List.go        |  41 ++++
 openstack/waf-premium/v1/hosts/Update.go      |  77 ++++++++
 openstack/waf-premium/v1/instances/Create.go  |   3 +-
 openstack/waf-premium/v1/instances/Get.go     |   2 +-
 openstack/waf-premium/v1/instances/Upgrade.go |   3 +-
 9 files changed, 475 insertions(+), 5 deletions(-)
 create mode 100644 acceptance/openstack/waf-premium/v1/host_test.go
 create mode 100644 openstack/waf-premium/v1/hosts/Create.go
 create mode 100644 openstack/waf-premium/v1/hosts/Delete.go
 create mode 100644 openstack/waf-premium/v1/hosts/Get.go
 create mode 100644 openstack/waf-premium/v1/hosts/List.go
 create mode 100644 openstack/waf-premium/v1/hosts/Update.go

diff --git a/acceptance/openstack/waf-premium/v1/host_test.go b/acceptance/openstack/waf-premium/v1/host_test.go
new file mode 100644
index 000000000..19fa27f8f
--- /dev/null
+++ b/acceptance/openstack/waf-premium/v1/host_test.go
@@ -0,0 +1,80 @@
+package v1
+
+import (
+	"os"
+	"testing"
+
+	golangsdk "github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud/acceptance/clients"
+	"github.com/opentelekomcloud/gophertelekomcloud/acceptance/tools"
+	"github.com/opentelekomcloud/gophertelekomcloud/openstack/common/pointerto"
+	"github.com/opentelekomcloud/gophertelekomcloud/openstack/waf-premium/v1/hosts"
+	th "github.com/opentelekomcloud/gophertelekomcloud/testhelper"
+)
+
+func TestWafPremiumHostWorkflow(t *testing.T) {
+	client, err := clients.NewWafPremiumV1Client()
+	th.AssertNoErr(t, err)
+
+	hostId := createHost(t, client)
+
+	t.Cleanup(func() {
+		t.Logf("Attempting to delete WAF Premium host: %s", hostId)
+		th.AssertNoErr(t, hosts.Delete(client, hostId, hosts.DeleteOpts{}))
+		t.Logf("Deleted WAF Premium host: %s", hostId)
+	})
+
+	t.Logf("Attempting to Get WAF Premium host: %s", hostId)
+	h, err := hosts.Get(client, hostId)
+	th.AssertNoErr(t, err)
+	th.AssertEquals(t, h.ID, hostId)
+
+	t.Logf("Attempting to List WAF Premium hosts")
+	hostsList, err := hosts.List(client, hosts.ListOpts{})
+	th.AssertNoErr(t, err)
+
+	if len(hostsList) < 1 {
+		t.Fatal("empty WAF hosts list")
+	}
+	// update not working
+	cipher := "cipher_1"
+	hostUpdated, err := hosts.Update(client, hostId, hosts.UpdateOpts{
+		Proxy:         pointerto.Bool(true),
+		Cipher:        cipher,
+		ProtectStatus: 0,
+		Tls:           "TLS v1.1",
+	})
+	th.AssertNoErr(t, err)
+	th.AssertEquals(t, hostUpdated.Proxy, true)
+}
+
+func createHost(t *testing.T, client *golangsdk.ServiceClient) string {
+	t.Logf("Attempting to create WAF premium host")
+	region := os.Getenv("OS_REGION_NAME")
+	vpcID := os.Getenv("OS_VPC_ID")
+	if vpcID == "" && region == "" {
+		t.Skip("OS_REGION_NAME, OS_VPC_ID env vars is required for this test")
+	}
+	// to be deleted
+	if region != "eu-ch2" {
+		t.Skip("this service deployed only in SWISS region for now")
+	}
+
+	server := hosts.PremiumWafServer{
+		FrontProtocol: "HTTP",
+		BackProtocol:  "HTTP",
+		Address:       "10.10.11.11",
+		Port:          80,
+		Type:          "ipv4",
+		VpcId:         vpcID,
+	}
+	opts := hosts.CreateOpts{
+		Hostname: tools.RandomString("www.waf-demo.com", 3),
+		Server:   []hosts.PremiumWafServer{server},
+		Proxy:    pointerto.Bool(false),
+	}
+	h, err := hosts.Create(client, opts)
+	th.AssertNoErr(t, err)
+	t.Logf("Created WAF host: %s", h.ID)
+	return h.ID
+}
diff --git a/openstack/waf-premium/v1/hosts/Create.go b/openstack/waf-premium/v1/hosts/Create.go
new file mode 100644
index 000000000..fbf4b3935
--- /dev/null
+++ b/openstack/waf-premium/v1/hosts/Create.go
@@ -0,0 +1,175 @@
+package hosts
+
+import (
+	"github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/build"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/extract"
+)
+
+type CreateOpts struct {
+	// HTTPS certificate ID.
+	// It can be obtained by calling the ListCertificates API.
+	// This parameter is not required when the client protocol is HTTP,
+	// but it is mandatory when the client protocol is HTTPS.
+	CertificateId string `json:"certificateid"`
+	// Certificate name.
+	// Certifacteid and certificatename are required at the same.
+	// If certificateid does not match certificatename, an error is reported.
+	// This parameter is not required when the client protocol is HTTP,
+	// but it is mandatory when the client protocol is HTTPS.
+	CertificateName string `json:"certificatename"`
+	// Protected domain name or IP address (port allowed)
+	Hostname string `json:"hostname" required:"true"`
+	// Whether a proxy is used for the domain name.
+	// If your website has no layer-7 proxy server
+	// such as CDN and cloud acceleration service deployed
+	// in front of WAF and uses only layer-4 load balancers
+	// (or NAT), set Proxy Configured to No. Otherwise,
+	// Proxy Configured must be set to Yes.
+	// This ensures that WAF obtains real IP addresses of website
+	// visitors and takes protective actions configured in
+	// protection policies.
+	Proxy *bool `json:"proxy" required:"true"`
+	// ID of the policy initially used to the domain name.
+	// It can be obtained by calling the API described in 2.1.1
+	// Querying Protection Policies.
+	PolicyId string `json:"policyid"`
+	// Server configuration in dedicated mode
+	Server []PremiumWafServer `json:"server" required:"true"`
+}
+
+type PremiumWafServer struct {
+	// Client protocol
+	// Enumeration values:
+	// HTTP
+	// HTTPS
+	FrontProtocol string `json:"front_protocol" required:"true"`
+	// Server protocol
+	// Enumeration values:
+	// HTTP
+	// HTTPS
+	BackProtocol string `json:"back_protocol" required:"true"`
+	// IP address or domain name of the origin server that the client accesses.
+	Address string `json:"address" required:"true"`
+	// Server port
+	Port int `json:"port" required:"true"`
+	// The origin server address is an IPv4 or IPv6 address. Default value: ipv4
+	// Enumeration values:
+	// ipv4
+	// ipv6
+	Type string `json:"type" required:"true"`
+	// VPC ID. Perform the following steps to obtain the VPC ID:
+	// 1.Find the name of the VPC where the dedicated engine is located. The VPC name is in the VPC\Subnet column. Log in to the WAF console and choose Instance Management > Dedicated Engine > VPC\Subnet.
+	// Log in to the VPC console and click the VPC name. On the page displayed, copy the VPC ID in the VPC Information area.
+	VpcId string `json:"vpc_id" required:"true"`
+}
+
+// Create will create a new Protected Domain Name on the values in CreateOpts.
+func Create(client *golangsdk.ServiceClient, opts CreateOpts) (*HostResponse, error) {
+	b, err := build.RequestBody(opts, "")
+	if err != nil {
+		return nil, err
+	}
+
+	// POST /v1/{project_id}/premium-waf/host
+	raw, err := client.Post(client.ServiceURL("host"), b,
+		nil, &golangsdk.RequestOpts{
+			OkCodes: []int{200},
+		})
+	if err != nil {
+		return nil, err
+	}
+
+	var res HostResponse
+	err = extract.Into(raw.Body, &res)
+	return &res, err
+}
+
+type HostResponse struct {
+	// Protected domain name ID
+	ID string `json:"id"`
+	// Policy ID
+	PolicyId string `json:"policyid"`
+	// Protected domain name
+	Hostname string `json:"hostname"`
+	// Tenant ID
+	DomainId string `json:"domainid"`
+	// Project ID
+	ProjectId string `json:"projectid"`
+	// HTTP protocol
+	Protocol string `json:"protocol"`
+	// WAF status of the protected domain name.
+	// -1: Bypassed. Requests are directly sent to the backend servers without passing through WAF.
+	// 0: Suspended. WAF only forwards requests for the domain name but does not detect attacks.
+	// -1: Enabled. WAF detects attacks based on the configured policy.
+	ProtectStatus int `json:"protect_status"`
+	// Whether a domain name is connected to WAF.
+	// 0: disconnected
+	// 1: connected
+	AccessStatus int `json:"access_status"`
+	// Whether a proxy is used.
+	// true: The proxy is enabled.
+	// false: The proxy is disabled.
+	Proxy bool `json:"proxy"`
+	// Origin server list
+	Server []ServerResponse `json:"server"`
+	// Special domain name identifier, which is used to store additional domain name configuration.
+	Flag *FlagResponse `json:"flag"`
+	// Alarm configuration page
+	BlockPage *BlockPageResponse `json:"block_page"`
+	// Not described
+	Extend map[string]string `json:"extend"`
+	// Creation time.
+	CreatedAt int `json:"timestamp"`
+}
+
+type ServerResponse struct {
+	// Client protocol
+	// Enumeration values:
+	// HTTP
+	// HTTPS
+	FrontProtocol string `json:"front_protocol"`
+	// Server protocol
+	// Enumeration values:
+	// HTTP
+	// HTTPS
+	BackProtocol string `json:"back_protocol"`
+	// IP address or domain name of the origin server that the client accesses.
+	Address string `json:"address"`
+	// Server port
+	Port int `json:"port"`
+	// The origin server address is an IPv4 or IPv6 address. Default value: ipv4
+	// Enumeration values:
+	// ipv4
+	// ipv6
+	Type string `json:"type"`
+	// VPC ID. Perform the following steps to obtain the VPC ID:
+	// 1.Find the name of the VPC where the dedicated engine is located. The VPC name is in the VPC\Subnet column. Log in to the WAF console and choose Instance Management > Dedicated Engine > VPC\Subnet.
+	// Log in to the VPC console and click the VPC name. On the page displayed, copy the VPC ID in the VPC Information area.
+	VpcId string `json:"vpc_id"`
+}
+
+type FlagResponse struct {
+	// Whether PCI 3DS certification check is enabled for the domain name. Currently, this function is not supported. The default value is false. You can ignore this parameter.
+	// true: PCI 3DS check is enabled.
+	// false: PCI 3DS check is disabled.
+	Pci3ds string `json:"pci_3ds"`
+	// Whether PCI DDS certification check is enabled for the domain name.
+	// true: PCI DDS check is enabled.
+	// false: PCI DDS check is disabled.
+	PciDss string `json:"pci_dss"`
+}
+type BlockPageResponse struct {
+	// Template name
+	Template string `json:"template"`
+	// Custom alarm page
+	CustomPage *CustomPageResponse `json:"custom_page"`
+	// Redirection URL
+	RedirectUrl string `json:"redirect_url"`
+}
+
+type CustomPageResponse struct {
+	StatusCode  string `json:"status_code"`
+	ContentType string `json:"content_type"`
+	Content     string `json:"content"`
+}
diff --git a/openstack/waf-premium/v1/hosts/Delete.go b/openstack/waf-premium/v1/hosts/Delete.go
new file mode 100644
index 000000000..a47d3aa47
--- /dev/null
+++ b/openstack/waf-premium/v1/hosts/Delete.go
@@ -0,0 +1,21 @@
+package hosts
+
+import (
+	"github.com/opentelekomcloud/gophertelekomcloud"
+)
+
+type DeleteOpts struct {
+	KeepPolicy *bool `q:"keepPolicy"`
+}
+
+func Delete(client *golangsdk.ServiceClient, id string, opts DeleteOpts) (err error) {
+	q, err := golangsdk.BuildQueryString(opts)
+	if err != nil {
+		return
+	}
+	_, err = client.Delete(client.ServiceURL("host", id)+q.String(), &golangsdk.RequestOpts{
+		OkCodes:     []int{200},
+		MoreHeaders: map[string]string{"Content-Type": "application/json;charset=utf8"},
+	})
+	return
+}
diff --git a/openstack/waf-premium/v1/hosts/Get.go b/openstack/waf-premium/v1/hosts/Get.go
new file mode 100644
index 000000000..d6d575678
--- /dev/null
+++ b/openstack/waf-premium/v1/hosts/Get.go
@@ -0,0 +1,78 @@
+package hosts
+
+import (
+	"github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/extract"
+)
+
+func Get(client *golangsdk.ServiceClient, id string) (*Host, error) {
+	// GET /v1/{project_id}/premium-waf/host
+	raw, err := client.Get(client.ServiceURL("host", id), nil, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var res Host
+	return &res, extract.Into(raw.Body, &res)
+}
+
+type Host struct {
+	// Domain name ID
+	ID string `json:"id"`
+	// ID of the policy initially used to the domain name.
+	// It can be obtained by calling the API described in 2.1.1 Querying Protection Policies.
+	PolicyId string `json:"policyid"`
+	// Domain name added to cloud WAF.
+	Hostname string `json:"hostname"`
+	// User domain ID.
+	DomainId string `json:"domainid"`
+	// Project ID.
+	ProjectId string `json:"project_id"`
+	// HTTP protocol.
+	Protocol string `json:"protocol"`
+	// Minimum TLS version supported.
+	// TLS v1.0 is used by default.
+	// The value can be:TLS v1.0TLS v1.1TLS v1.2TLS v1.3
+	Tls string `json:"tls"`
+	// Cipher suite. The value can be:
+	// cipher_1: ECDHE-ECDSA-AES256-GCM-SHA384:HIGH:!MEDIUM:!LOW:!aNULL:!eNULL:!DES:!MD5:!PSK:!RC4:!kRSA:!SRP:!3DES:!DSS:!EXP:!CAMELLIA:@STRENGTH
+	// cipher_2: EECDH+AESGCM:EDH+AESGCM
+	// cipher_3: ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:RC4:HIGH:!MD5:!aNULL:!eNULL:!NULL:!DH:!EDH
+	// cipher_4. ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!eNULL:!NULL:!EDH n - cipher_default: ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!eNULL:!NULL:!DH:!EDH:!AESGCM
+	Cipher string `json:"cipher"`
+	// Origin server details
+	Server []ServerResponse `json:"server"`
+	// HTTPS certificate ID.
+	// It can be obtained by calling the ListCertificates API.
+	// n - This parameter is not required when the client protocol is HTTP.
+	// n - This parameter is mandatory when the client protocol is HTTPS.
+	CertificateId string `json:"certificateid"`
+	// Certificate name.
+	// n - This parameter is not required when the client protocol is HTTP.
+	// n - This parameter is mandatory when the client protocol is HTTPS.
+	CertificateName string `json:"certificatename"`
+	// Whether the proxy is enabled
+	Proxy bool `json:"proxy"`
+	// Lock status. This parameter is redundant and can be ignored. Default value: 0
+	Locked int `json:"locked"`
+	// WAF status of the protected domain name. The value can be:
+	// -1: Bypassed. Requests are directly sent to the backend servers without passing through WAF.
+	// 0: Suspended. WAF only forwards requests for the domain name but does not detect attacks.
+	// 1: Enabled. WAF detects attacks based on the configured policy.
+	ProtectStatus int `json:"protect_status"`
+	// Whether a domain name is connected to WAF.
+	// 0: The domain name is not connected to the engine instance.
+	// 1: The domain name is connected to the engine instance.
+	AccessStatus int `json:"access_status"`
+	// Time a domain name is added to WAF
+	CreatedAt int `json:"timestamp"`
+	// Special domain name identifier, which is used to store additional domain name configurations
+	Flag *FlagResponse `json:"flag"`
+	// Alarm configuration page
+	BlockPage *BlockPageResponse `json:"block_page"`
+	// Extended attribute
+	Extend map[string]string `json:"extend"`
+	// WAF mode. The value is premium, indicating
+	// the dedicated WAF engine
+	WafType string `json:"waf_type"`
+}
diff --git a/openstack/waf-premium/v1/hosts/List.go b/openstack/waf-premium/v1/hosts/List.go
new file mode 100644
index 000000000..ef63373c4
--- /dev/null
+++ b/openstack/waf-premium/v1/hosts/List.go
@@ -0,0 +1,41 @@
+package hosts
+
+import (
+	golangsdk "github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/extract"
+)
+
+func List(client *golangsdk.ServiceClient, opts ListOpts) ([]Host, error) {
+	// GET /v1/{project_id}/premium-waf/host
+	query, err := golangsdk.BuildQueryString(opts)
+	if err != nil {
+		return nil, err
+	}
+
+	url := client.ServiceURL("host") + query.String()
+	raw, err := client.Get(url, nil, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var res []Host
+	err = extract.IntoSlicePtr(raw.Body, &res, "items")
+	return res, err
+}
+
+type ListOpts struct {
+	// Number of records on each page.
+	// The maximum value is 100. Default value: 10
+	PageSize string `q:"pageSize,omitempty"`
+	// Current page number
+	Page string `q:"page,omitempty"`
+	// Domain name
+	Hostname string `q:"hostname,omitempty"`
+	// Policy Name
+	PolicyName string `q:"policyname,omitempty"`
+	// WAF status of the protected domain name. The value can be:
+	// -1: Bypassed. Requests are directly sent to the backend servers without passing through WAF.
+	// 0: Suspended. WAF only forwards requests for the domain name but does not detect attacks.
+	// 1: Enabled. WAF detects attacks based on the configured policy.
+	ProtectStatus int `q:"protect_status,omitempty"`
+}
diff --git a/openstack/waf-premium/v1/hosts/Update.go b/openstack/waf-premium/v1/hosts/Update.go
new file mode 100644
index 000000000..a0134ad0e
--- /dev/null
+++ b/openstack/waf-premium/v1/hosts/Update.go
@@ -0,0 +1,77 @@
+package hosts
+
+import (
+	"github.com/opentelekomcloud/gophertelekomcloud"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/build"
+	"github.com/opentelekomcloud/gophertelekomcloud/internal/extract"
+)
+
+type UpdateOpts struct {
+	// Whether a proxy is used for the domain name.
+	// If your website has no layer-7 proxy server such as CDN and cloud
+	// acceleration service deployed in front of WAF and uses only layer-4 load balancers (or NAT),
+	// set Proxy Configured to No. Otherwise, Proxy Configured must be set to Yes.
+	// This ensures that WAF obtains real IP addresses of website visitors and
+	// takes protective actions configured in protection policies.
+	Proxy *bool `json:"proxy"`
+	// HTTPS certificate ID. It can be obtained by calling the ListCertificates API.
+	CertificateId string `json:"certificateid"`
+	// HTTPS certificate name. It can be obtained by calling the ListCertificates API.
+	// Certifacteid and certificatename are required at the same.
+	// If certificateid does not match certificatename, an error is reported.
+	CertificateName string `json:"certificatename"`
+	// Minimum TLS version supported.
+	// TLS v1.0 is used by default.
+	// The value can be:TLS v1.0TLS v1.1TLS v1.2TLS v1.3
+	Tls string `json:"tls"`
+	// Cipher suite. The value can be:
+	// cipher_1: ECDHE-ECDSA-AES256-GCM-SHA384:HIGH:!MEDIUM:!LOW:!aNULL:!eNULL:!DES:!MD5:!PSK:!RC4:!kRSA:!SRP:!3DES:!DSS:!EXP:!CAMELLIA:@STRENGTH
+	// cipher_2: EECDH+AESGCM:EDH+AESGCM
+	// cipher_3: ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:RC4:HIGH:!MD5:!aNULL:!eNULL:!NULL:!DH:!EDH
+	// cipher_4. ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!eNULL:!NULL:!EDH n - cipher_default: ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!eNULL:!NULL:!DH:!EDH:!AESGCM
+	Cipher string `json:"cipher"`
+	// WAF status of the protected domain name.
+	// -1: Bypassed. Requests are directly sent to the backend servers without passing through WAF.
+	// 0: Suspended. WAF only forwards requests for the domain name but does not detect attacks.
+	// -1: Enabled. WAF detects attacks based on the configured policy.
+	ProtectStatus int `json:"protect_status"`
+	// Alarm configuration page.
+	BlockPage *BlockPage `json:"block_page"`
+}
+
+type BlockPage struct {
+	// Template name
+	Template string `json:"template" required:"true"`
+	// Custom alarm page
+	CustomPage *CustomPage `json:"custom_page"`
+	// Redirection URL
+	RedirectUrl string `json:"redirect_url"`
+}
+
+type CustomPage struct {
+	// Status Codes
+	StatusCode string `json:"status_code" required:"true"`
+	// Content type of alarm page
+	ContentType string `json:"content_type" required:"true"`
+	// Page content
+	Content string `json:"content" required:"true"`
+}
+
+func Update(client *golangsdk.ServiceClient, id string, opts UpdateOpts) (*Host, error) {
+	b, err := build.RequestBody(opts, "")
+	if err != nil {
+		return nil, err
+	}
+
+	// PUT /v1/{project_id}/premium-waf/host
+	raw, err := client.Put(client.ServiceURL("host", id), b, nil, &golangsdk.RequestOpts{
+		OkCodes:     []int{200},
+		MoreHeaders: map[string]string{"Content-Type": "application/json;charset=utf8"},
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	var res Host
+	return &res, extract.Into(raw.Body, &res)
+}
diff --git a/openstack/waf-premium/v1/instances/Create.go b/openstack/waf-premium/v1/instances/Create.go
index 81fee869b..731ca421b 100644
--- a/openstack/waf-premium/v1/instances/Create.go
+++ b/openstack/waf-premium/v1/instances/Create.go
@@ -48,8 +48,7 @@ type CreateOpts struct {
 	Count int `json:"count" required:"true"`
 }
 
-// Create will create a new instance on the values in CreateOpts. To extract
-// the instance object from the response, call the Extract method on the CreateResult.
+// Create will create a new instance on the values in CreateOpts.
 func Create(client *golangsdk.ServiceClient, opts CreateOpts) (*InstanceResponse, error) {
 	b, err := build.RequestBody(opts, "")
 	if err != nil {
diff --git a/openstack/waf-premium/v1/instances/Get.go b/openstack/waf-premium/v1/instances/Get.go
index 38495cf03..d1a878106 100644
--- a/openstack/waf-premium/v1/instances/Get.go
+++ b/openstack/waf-premium/v1/instances/Get.go
@@ -72,7 +72,7 @@ type Instance struct {
 	// ID of the ECS hosting the dedicated engine.
 	ServerId string `json:"server_id"`
 	// Timestamp when the dedicated WAF engine was created.
-	CreatedAt int64 `json:"create_time"`
+	CreatedAt int `json:"create_time"`
 }
 
 type HostEntry struct {
diff --git a/openstack/waf-premium/v1/instances/Upgrade.go b/openstack/waf-premium/v1/instances/Upgrade.go
index 745d30f37..f1fdb562c 100644
--- a/openstack/waf-premium/v1/instances/Upgrade.go
+++ b/openstack/waf-premium/v1/instances/Upgrade.go
@@ -12,8 +12,7 @@ type UpgradeOpts struct {
 	Action string `json:"action"`
 }
 
-// Upgrade will create a new instance on the values in CreateOpts. To extract
-// the instance object from the response, call the Extract method on the CreateResult.
+// Upgrade will upgrade instance software.
 func Upgrade(client *golangsdk.ServiceClient, id string) (*Instance, error) {
 	b, err := build.RequestBody(UpgradeOpts{
 		Action: "upgrade",

From bafc707b61f8ad5b99b9596e2bdbaaaffe785e65 Mon Sep 17 00:00:00 2001
From: anton-sidelnikov <a.sidelnikov@t-systems.com>
Date: Mon, 24 Jul 2023 15:20:49 +0200
Subject: [PATCH 5/6] rework for using different clients in different regions

---
 acceptance/clients/clients.go                 | 15 +++-
 .../openstack/waf-premium/v1/host_test.go     | 48 +++++++------
 .../openstack/waf-premium/v1/instance_test.go | 71 +++++++++----------
 openstack/client.go                           | 16 ++++-
 openstack/waf-premium/v1/hosts/Create.go      |  2 +-
 openstack/waf-premium/v1/hosts/Delete.go      |  2 +-
 openstack/waf-premium/v1/hosts/Get.go         |  2 +-
 openstack/waf-premium/v1/hosts/List.go        |  4 +-
 openstack/waf-premium/v1/hosts/Update.go      |  2 +-
 openstack/waf-premium/v1/instances/Create.go  |  2 +-
 openstack/waf-premium/v1/instances/Delete.go  |  2 +-
 openstack/waf-premium/v1/instances/Get.go     |  2 +-
 openstack/waf-premium/v1/instances/List.go    |  2 +-
 openstack/waf-premium/v1/instances/Update.go  |  2 +-
 openstack/waf-premium/v1/instances/Upgrade.go |  2 +-
 15 files changed, 98 insertions(+), 76 deletions(-)

diff --git a/acceptance/clients/clients.go b/acceptance/clients/clients.go
index 624f8a407..ef6cc39e1 100644
--- a/acceptance/clients/clients.go
+++ b/acceptance/clients/clients.go
@@ -526,13 +526,22 @@ func NewWafV1Client() (*golangsdk.ServiceClient, error) {
 	return openstack.NewWAFV1(cc.ProviderClient, golangsdk.EndpointOpts{Region: cc.RegionName})
 }
 
-// NewWafPremiumV1Client returns authenticated WAF premium v1 client
-func NewWafPremiumV1Client() (*golangsdk.ServiceClient, error) {
+// NewWafdSwissV1Client returns authenticated WAF premium v1 client
+func NewWafdSwissV1Client() (*golangsdk.ServiceClient, error) {
 	cc, err := CloudAndClient()
 	if err != nil {
 		return nil, err
 	}
-	return openstack.NewWAFPremiumV1(cc.ProviderClient, golangsdk.EndpointOpts{Region: cc.RegionName})
+	return openstack.NewWAFDSwissV1(cc.ProviderClient, golangsdk.EndpointOpts{Region: cc.RegionName})
+}
+
+// NewWafdV1Client returns authenticated WAF premium v1 client
+func NewWafdV1Client() (*golangsdk.ServiceClient, error) {
+	cc, err := CloudAndClient()
+	if err != nil {
+		return nil, err
+	}
+	return openstack.NewWAFDV1(cc.ProviderClient, golangsdk.EndpointOpts{Region: cc.RegionName})
 }
 
 // NewCsbsV1Client returns authenticated CSBS v1 client
diff --git a/acceptance/openstack/waf-premium/v1/host_test.go b/acceptance/openstack/waf-premium/v1/host_test.go
index 19fa27f8f..3c5ab0032 100644
--- a/acceptance/openstack/waf-premium/v1/host_test.go
+++ b/acceptance/openstack/waf-premium/v1/host_test.go
@@ -13,10 +13,23 @@ import (
 )
 
 func TestWafPremiumHostWorkflow(t *testing.T) {
-	client, err := clients.NewWafPremiumV1Client()
-	th.AssertNoErr(t, err)
+	region := os.Getenv("OS_REGION_NAME")
+	vpcID := os.Getenv("OS_VPC_ID")
+	if vpcID == "" && region == "" {
+		t.Skip("OS_REGION_NAME, OS_VPC_ID env vars is required for this test")
+	}
+
+	var client *golangsdk.ServiceClient
+	var err error
+	if region == "eu-ch2" {
+		client, err = clients.NewWafdSwissV1Client()
+		th.AssertNoErr(t, err)
+	} else {
+		client, err = clients.NewWafdV1Client()
+		th.AssertNoErr(t, err)
+	}
 
-	hostId := createHost(t, client)
+	hostId := createHost(t, client, vpcID)
 
 	t.Cleanup(func() {
 		t.Logf("Attempting to delete WAF Premium host: %s", hostId)
@@ -37,28 +50,19 @@ func TestWafPremiumHostWorkflow(t *testing.T) {
 		t.Fatal("empty WAF hosts list")
 	}
 	// update not working
-	cipher := "cipher_1"
-	hostUpdated, err := hosts.Update(client, hostId, hosts.UpdateOpts{
-		Proxy:         pointerto.Bool(true),
-		Cipher:        cipher,
-		ProtectStatus: 0,
-		Tls:           "TLS v1.1",
-	})
-	th.AssertNoErr(t, err)
-	th.AssertEquals(t, hostUpdated.Proxy, true)
+	// cipher := "cipher_1"
+	// hostUpdated, err := hosts.Update(client, hostId, hosts.UpdateOpts{
+	// 	Proxy:         pointerto.Bool(true),
+	// 	Cipher:        cipher,
+	// 	ProtectStatus: 0,
+	// 	Tls:           "TLS v1.1",
+	// })
+	// th.AssertNoErr(t, err)
+	// th.AssertEquals(t, hostUpdated.Proxy, true)
 }
 
-func createHost(t *testing.T, client *golangsdk.ServiceClient) string {
+func createHost(t *testing.T, client *golangsdk.ServiceClient, vpcID string) string {
 	t.Logf("Attempting to create WAF premium host")
-	region := os.Getenv("OS_REGION_NAME")
-	vpcID := os.Getenv("OS_VPC_ID")
-	if vpcID == "" && region == "" {
-		t.Skip("OS_REGION_NAME, OS_VPC_ID env vars is required for this test")
-	}
-	// to be deleted
-	if region != "eu-ch2" {
-		t.Skip("this service deployed only in SWISS region for now")
-	}
 
 	server := hosts.PremiumWafServer{
 		FrontProtocol: "HTTP",
diff --git a/acceptance/openstack/waf-premium/v1/instance_test.go b/acceptance/openstack/waf-premium/v1/instance_test.go
index b6e2a3a8a..be3e60762 100644
--- a/acceptance/openstack/waf-premium/v1/instance_test.go
+++ b/acceptance/openstack/waf-premium/v1/instance_test.go
@@ -13,10 +13,43 @@ import (
 )
 
 func TestWafPremiumInstanceWorkflow(t *testing.T) {
-	client, err := clients.NewWafPremiumV1Client()
+	region := os.Getenv("OS_REGION_NAME")
+	az := os.Getenv("OS_AVAILABILITY_ZONE")
+	vpcID := os.Getenv("OS_VPC_ID")
+	subnetID := os.Getenv("OS_NETWORK_ID")
+	if vpcID == "" && subnetID == "" && region == "" && az == "" {
+		t.Skip("OS_REGION_NAME, OS_AVAILABILITY_ZONE, OS_VPC_ID and OS_NETWORK_ID env vars is required for this test")
+	}
+
+	var client *golangsdk.ServiceClient
+	var err error
+	if region == "eu-ch2" {
+		client, err = clients.NewWafdSwissV1Client()
+		th.AssertNoErr(t, err)
+	} else {
+		client, err = clients.NewWafdV1Client()
+		th.AssertNoErr(t, err)
+	}
+
+	opts := instances.CreateOpts{
+		Count:            1,
+		Region:           region,
+		AvailabilityZone: az,
+		Architecture:     "x86_64",
+		InstanceName:     tools.RandomString("waf-instance-", 3),
+		Specification:    "waf.instance.enterprise",
+		Flavor:           "s3.2xlarge.2",
+		VpcId:            vpcID,
+		SubnetId:         subnetID,
+		SecurityGroupsId: []string{openstack.DefaultSecurityGroup(t)},
+	}
+
+	t.Logf("Attempting to create WAF premium instance")
+	inst, err := instances.Create(client, opts)
 	th.AssertNoErr(t, err)
+	t.Logf("Created WAF instance: %s", inst.Instances[0].Id)
+	instanceId := inst.Instances[0].Id
 
-	instanceId := createInstance(t, client)
 	th.AssertNoErr(t, waitForInstanceToBeCreated(client, 600, instanceId))
 
 	t.Cleanup(func() {
@@ -43,37 +76,3 @@ func TestWafPremiumInstanceWorkflow(t *testing.T) {
 	th.AssertNoErr(t, err)
 	th.AssertEquals(t, instanceUpdated.Name, updatedName)
 }
-
-func createInstance(t *testing.T, client *golangsdk.ServiceClient) string {
-	t.Logf("Attempting to create WAF premium instance")
-
-	region := os.Getenv("OS_REGION_NAME")
-	az := os.Getenv("OS_AVAILABILITY_ZONE")
-	vpcID := os.Getenv("OS_VPC_ID")
-	subnetID := os.Getenv("OS_NETWORK_ID")
-	if vpcID == "" && subnetID == "" && region == "" && az == "" {
-		t.Skip("OS_REGION_NAME, OS_AVAILABILITY_ZONE, OS_VPC_ID and OS_NETWORK_ID env vars is required for this test")
-	}
-	// to be deleted
-	if region != "eu-ch2" {
-		t.Skip("this service deployed only in SWISS region for now")
-	}
-	//
-
-	opts := instances.CreateOpts{
-		Count:            1,
-		Region:           region,
-		AvailabilityZone: az,
-		Architecture:     "x86_64",
-		InstanceName:     tools.RandomString("waf-instance-", 3),
-		Specification:    "waf.instance.enterprise",
-		Flavor:           "s3.2xlarge.2",
-		VpcId:            vpcID,
-		SubnetId:         subnetID,
-		SecurityGroupsId: []string{openstack.DefaultSecurityGroup(t)},
-	}
-	inst, err := instances.Create(client, opts)
-	th.AssertNoErr(t, err)
-	t.Logf("Created WAF instance: %s", inst.Instances[0].Id)
-	return inst.Instances[0].Id
-}
diff --git a/openstack/client.go b/openstack/client.go
index a19e38aad..da4df635a 100644
--- a/openstack/client.go
+++ b/openstack/client.go
@@ -859,13 +859,23 @@ func NewWAFV1(client *golangsdk.ProviderClient, eo golangsdk.EndpointOpts) (*gol
 	return sc, err
 }
 
-// NewWAFPremiumV1 creates a ServiceClient that may be used to access the premium WAF service.
-func NewWAFPremiumV1(client *golangsdk.ProviderClient, eo golangsdk.EndpointOpts) (*golangsdk.ServiceClient, error) {
+// NewWAFDSwissV1 creates a ServiceClient that may be used to access the premium WAF service.
+func NewWAFDSwissV1(client *golangsdk.ProviderClient, eo golangsdk.EndpointOpts) (*golangsdk.ServiceClient, error) {
 	sc, err := initClientOpts(client, eo, "waf")
 	if err != nil {
 		return nil, err
 	}
-	sc.ResourceBase = sc.Endpoint + "v1/" + client.ProjectID + "/premium-waf/"
+	sc.ResourceBase = sc.Endpoint + "v1/" + client.ProjectID + "/"
+	return sc, err
+}
+
+// NewWAFDV1 creates a ServiceClient that may be used to access the premium WAF service.
+func NewWAFDV1(client *golangsdk.ProviderClient, eo golangsdk.EndpointOpts) (*golangsdk.ServiceClient, error) {
+	sc, err := initClientOpts(client, eo, "premium-waf")
+	if err != nil {
+		return nil, err
+	}
+	sc.ResourceBase = sc.Endpoint + "v1/" + client.ProjectID + "/"
 	return sc, err
 }
 
diff --git a/openstack/waf-premium/v1/hosts/Create.go b/openstack/waf-premium/v1/hosts/Create.go
index fbf4b3935..62878be3e 100644
--- a/openstack/waf-premium/v1/hosts/Create.go
+++ b/openstack/waf-premium/v1/hosts/Create.go
@@ -72,7 +72,7 @@ func Create(client *golangsdk.ServiceClient, opts CreateOpts) (*HostResponse, er
 	}
 
 	// POST /v1/{project_id}/premium-waf/host
-	raw, err := client.Post(client.ServiceURL("host"), b,
+	raw, err := client.Post(client.ServiceURL("premium-waf", "host"), b,
 		nil, &golangsdk.RequestOpts{
 			OkCodes: []int{200},
 		})
diff --git a/openstack/waf-premium/v1/hosts/Delete.go b/openstack/waf-premium/v1/hosts/Delete.go
index a47d3aa47..14a93226b 100644
--- a/openstack/waf-premium/v1/hosts/Delete.go
+++ b/openstack/waf-premium/v1/hosts/Delete.go
@@ -13,7 +13,7 @@ func Delete(client *golangsdk.ServiceClient, id string, opts DeleteOpts) (err er
 	if err != nil {
 		return
 	}
-	_, err = client.Delete(client.ServiceURL("host", id)+q.String(), &golangsdk.RequestOpts{
+	_, err = client.Delete(client.ServiceURL("premium-waf", "host", id)+q.String(), &golangsdk.RequestOpts{
 		OkCodes:     []int{200},
 		MoreHeaders: map[string]string{"Content-Type": "application/json;charset=utf8"},
 	})
diff --git a/openstack/waf-premium/v1/hosts/Get.go b/openstack/waf-premium/v1/hosts/Get.go
index d6d575678..5dbde0e6c 100644
--- a/openstack/waf-premium/v1/hosts/Get.go
+++ b/openstack/waf-premium/v1/hosts/Get.go
@@ -7,7 +7,7 @@ import (
 
 func Get(client *golangsdk.ServiceClient, id string) (*Host, error) {
 	// GET /v1/{project_id}/premium-waf/host
-	raw, err := client.Get(client.ServiceURL("host", id), nil, nil)
+	raw, err := client.Get(client.ServiceURL("premium-waf", "host", id), nil, nil)
 	if err != nil {
 		return nil, err
 	}
diff --git a/openstack/waf-premium/v1/hosts/List.go b/openstack/waf-premium/v1/hosts/List.go
index ef63373c4..eff2dcbe6 100644
--- a/openstack/waf-premium/v1/hosts/List.go
+++ b/openstack/waf-premium/v1/hosts/List.go
@@ -6,13 +6,13 @@ import (
 )
 
 func List(client *golangsdk.ServiceClient, opts ListOpts) ([]Host, error) {
-	// GET /v1/{project_id}/premium-waf/host
 	query, err := golangsdk.BuildQueryString(opts)
 	if err != nil {
 		return nil, err
 	}
 
-	url := client.ServiceURL("host") + query.String()
+	// GET /v1/{project_id}/premium-waf/host
+	url := client.ServiceURL("premium-waf", "host") + query.String()
 	raw, err := client.Get(url, nil, nil)
 	if err != nil {
 		return nil, err
diff --git a/openstack/waf-premium/v1/hosts/Update.go b/openstack/waf-premium/v1/hosts/Update.go
index a0134ad0e..7e12b9db7 100644
--- a/openstack/waf-premium/v1/hosts/Update.go
+++ b/openstack/waf-premium/v1/hosts/Update.go
@@ -64,7 +64,7 @@ func Update(client *golangsdk.ServiceClient, id string, opts UpdateOpts) (*Host,
 	}
 
 	// PUT /v1/{project_id}/premium-waf/host
-	raw, err := client.Put(client.ServiceURL("host", id), b, nil, &golangsdk.RequestOpts{
+	raw, err := client.Put(client.ServiceURL("premium-waf", "host", id), b, nil, &golangsdk.RequestOpts{
 		OkCodes:     []int{200},
 		MoreHeaders: map[string]string{"Content-Type": "application/json;charset=utf8"},
 	})
diff --git a/openstack/waf-premium/v1/instances/Create.go b/openstack/waf-premium/v1/instances/Create.go
index 731ca421b..c10bedb20 100644
--- a/openstack/waf-premium/v1/instances/Create.go
+++ b/openstack/waf-premium/v1/instances/Create.go
@@ -56,7 +56,7 @@ func Create(client *golangsdk.ServiceClient, opts CreateOpts) (*InstanceResponse
 	}
 
 	// POST /v1/{project_id}/premium-waf/instance
-	raw, err := client.Post(client.ServiceURL("instance"), b,
+	raw, err := client.Post(client.ServiceURL("premium-waf", "instance"), b,
 		nil, &golangsdk.RequestOpts{
 			OkCodes: []int{201},
 		})
diff --git a/openstack/waf-premium/v1/instances/Delete.go b/openstack/waf-premium/v1/instances/Delete.go
index f2994b24b..b8056cd09 100644
--- a/openstack/waf-premium/v1/instances/Delete.go
+++ b/openstack/waf-premium/v1/instances/Delete.go
@@ -5,7 +5,7 @@ import (
 )
 
 func Delete(client *golangsdk.ServiceClient, id string) (err error) {
-	_, err = client.Delete(client.ServiceURL("instance", id), &golangsdk.RequestOpts{
+	_, err = client.Delete(client.ServiceURL("premium-waf", "instance", id), &golangsdk.RequestOpts{
 		OkCodes:     []int{200},
 		MoreHeaders: map[string]string{"Content-Type": "application/json;charset=utf8"},
 	})
diff --git a/openstack/waf-premium/v1/instances/Get.go b/openstack/waf-premium/v1/instances/Get.go
index d1a878106..a2d6e3b11 100644
--- a/openstack/waf-premium/v1/instances/Get.go
+++ b/openstack/waf-premium/v1/instances/Get.go
@@ -7,7 +7,7 @@ import (
 
 func Get(client *golangsdk.ServiceClient, id string) (*Instance, error) {
 	// GET /v1/{project_id}/premium-waf/instance
-	raw, err := client.Get(client.ServiceURL("instance", id), nil, nil)
+	raw, err := client.Get(client.ServiceURL("premium-waf", "instance", id), nil, nil)
 	if err != nil {
 		return nil, err
 	}
diff --git a/openstack/waf-premium/v1/instances/List.go b/openstack/waf-premium/v1/instances/List.go
index d2047e27e..a86100fac 100644
--- a/openstack/waf-premium/v1/instances/List.go
+++ b/openstack/waf-premium/v1/instances/List.go
@@ -12,7 +12,7 @@ func List(client *golangsdk.ServiceClient, opts ListOpts) ([]Instance, error) {
 		return nil, err
 	}
 
-	url := client.ServiceURL("instance") + query.String()
+	url := client.ServiceURL("premium-waf", "instance") + query.String()
 	raw, err := client.Get(url, nil, nil)
 	if err != nil {
 		return nil, err
diff --git a/openstack/waf-premium/v1/instances/Update.go b/openstack/waf-premium/v1/instances/Update.go
index a60bc8af5..9e33aee23 100644
--- a/openstack/waf-premium/v1/instances/Update.go
+++ b/openstack/waf-premium/v1/instances/Update.go
@@ -18,7 +18,7 @@ func Update(client *golangsdk.ServiceClient, id string, opts UpdateOpts) (*Insta
 	}
 
 	// PUT /v1/{project_id}/premium-waf/instance
-	raw, err := client.Put(client.ServiceURL("instance", id), b, nil, &golangsdk.RequestOpts{
+	raw, err := client.Put(client.ServiceURL("premium-waf", "instance", id), b, nil, &golangsdk.RequestOpts{
 		OkCodes: []int{200},
 	})
 	if err != nil {
diff --git a/openstack/waf-premium/v1/instances/Upgrade.go b/openstack/waf-premium/v1/instances/Upgrade.go
index f1fdb562c..b9b21760c 100644
--- a/openstack/waf-premium/v1/instances/Upgrade.go
+++ b/openstack/waf-premium/v1/instances/Upgrade.go
@@ -22,7 +22,7 @@ func Upgrade(client *golangsdk.ServiceClient, id string) (*Instance, error) {
 	}
 
 	// POST /v1/{project_id}/premium-waf/instance
-	raw, err := client.Post(client.ServiceURL("instance", id, "action"), b,
+	raw, err := client.Post(client.ServiceURL("premium-waf", "instance", id, "action"), b,
 		nil, &golangsdk.RequestOpts{
 			OkCodes: []int{200},
 		})

From 9365b5d62aa4ff10af6ae7add90604b7e4f81bba Mon Sep 17 00:00:00 2001
From: anton-sidelnikov <a.sidelnikov@t-systems.com>
Date: Tue, 25 Jul 2023 14:52:17 +0200
Subject: [PATCH 6/6] fix

---
 acceptance/openstack/waf-premium/v1/instance_test.go | 8 +++++++-
 openstack/client.go                                  | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/acceptance/openstack/waf-premium/v1/instance_test.go b/acceptance/openstack/waf-premium/v1/instance_test.go
index be3e60762..cb0e5e1bc 100644
--- a/acceptance/openstack/waf-premium/v1/instance_test.go
+++ b/acceptance/openstack/waf-premium/v1/instance_test.go
@@ -13,6 +13,9 @@ import (
 )
 
 func TestWafPremiumInstanceWorkflow(t *testing.T) {
+	if os.Getenv("RUN_WAFD_INSTANCE_WORKFLOW") == "" {
+		t.Skip("too slow to run in zuul")
+	}
 	region := os.Getenv("OS_REGION_NAME")
 	az := os.Getenv("OS_AVAILABILITY_ZONE")
 	vpcID := os.Getenv("OS_VPC_ID")
@@ -23,19 +26,22 @@ func TestWafPremiumInstanceWorkflow(t *testing.T) {
 
 	var client *golangsdk.ServiceClient
 	var err error
+	architecture := "x86"
 	if region == "eu-ch2" {
 		client, err = clients.NewWafdSwissV1Client()
 		th.AssertNoErr(t, err)
+		architecture = "x86_64"
 	} else {
 		client, err = clients.NewWafdV1Client()
 		th.AssertNoErr(t, err)
+
 	}
 
 	opts := instances.CreateOpts{
 		Count:            1,
 		Region:           region,
 		AvailabilityZone: az,
-		Architecture:     "x86_64",
+		Architecture:     architecture,
 		InstanceName:     tools.RandomString("waf-instance-", 3),
 		Specification:    "waf.instance.enterprise",
 		Flavor:           "s3.2xlarge.2",
diff --git a/openstack/client.go b/openstack/client.go
index da4df635a..604850281 100644
--- a/openstack/client.go
+++ b/openstack/client.go
@@ -875,7 +875,7 @@ func NewWAFDV1(client *golangsdk.ProviderClient, eo golangsdk.EndpointOpts) (*go
 	if err != nil {
 		return nil, err
 	}
-	sc.ResourceBase = sc.Endpoint + "v1/" + client.ProjectID + "/"
+	sc.ResourceBase = sc.Endpoint
 	return sc, err
 }