Skip to content

Add NetworkType and InternalAddresses fields to load balancers #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scd-pliv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add NetworkType and InternalAddresses fields to load balancers #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/fixtures/load_balancers/l4/create_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"name": "name87",
"type": "l4",
"status": "in_process",
"network_type": "public",
"external_addresses": [],
"internal_addresses": [],
"location_id": 1,
"location_code": "location2155",
"proxy_protocol_enabled": true,
Expand Down
2 changes: 2 additions & 0 deletions pkg/fixtures/load_balancers/l4/get_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
"name": "name87",
"type": "l4",
"status": "active",
"network_type": "public",
"external_addresses": [
"101.0.0.14"
],
"internal_addresses": [],
"location_id": 1,
"location_code": "location2155",
"proxy_protocol_enabled": false,
Expand Down
2 changes: 2 additions & 0 deletions pkg/fixtures/load_balancers/l4/update_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
"name": "some",
"type": "l4",
"status": "pending",
"network_type": "public",
"external_addresses": [
"101.0.0.14"
],
"internal_addresses": [],
"location_id": 1,
"location_code": "location2155",
"proxy_protocol_enabled": false,
Expand Down
2 changes: 2 additions & 0 deletions pkg/fixtures/load_balancers/l7/create_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
"example.com",
"www.example.com"
],
"network_type": "public",
"external_addresses": [
"10.0.0.1"
],
"internal_addresses": [],
"location_id": 1,
"location_code": "location2155",
"geoip": true,
Expand Down
2 changes: 2 additions & 0 deletions pkg/fixtures/load_balancers/l7/get_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
"domains": [
"updated.example.com"
],
"network_type": "public",
"external_addresses": [
"10.0.0.1"
],
"internal_addresses": [],
"location_id": 1,
"location_code": "location2155",
"geoip": false,
Expand Down
2 changes: 2 additions & 0 deletions pkg/fixtures/load_balancers/l7/update_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
"domains": [
"updated.example.com"
],
"network_type": "public",
"external_addresses": [
"10.0.0.1"
],
"internal_addresses": [],
"location_id": 1,
"location_code": "location2155",
"geoip": false,
Expand Down
14 changes: 13 additions & 1 deletion pkg/load_balancers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ func TestCreateL4LoadBalancer(t *testing.T) {
g.Expect(loadBalancer.ID).To(Equal("y1aKReQG"))
g.Expect(loadBalancer.Status).To(Equal("in_process"))
g.Expect(loadBalancer.Name).To(Equal("name87"))
g.Expect(loadBalancer.NetworkType).To(Equal("public"))
g.Expect(loadBalancer.InternalAddresses).To(BeEmpty())
g.Expect(loadBalancer.LocationID).To(Equal(int64(1)))
g.Expect(loadBalancer.LocationCode).To(Equal("location2155"))
g.Expect(loadBalancer.Labels).To(Equal(map[string]string{"env": "test"}))
Expand Down Expand Up @@ -93,6 +95,8 @@ func TestGetL4LoadBalancer(t *testing.T) {
g.Expect(loadBalancer.Status).To(Equal("active"))
g.Expect(loadBalancer.Name).To(Equal("name87"))
g.Expect(loadBalancer.Type).To(Equal("l4"))
g.Expect(loadBalancer.NetworkType).To(Equal("public"))
g.Expect(loadBalancer.InternalAddresses).To(BeEmpty())
g.Expect(loadBalancer.LocationID).To(Equal(int64(1)))
g.Expect(loadBalancer.LocationCode).To(Equal("location2155"))
g.Expect(loadBalancer.Labels).To(Equal(map[string]string{"env": "test"}))
Expand Down Expand Up @@ -127,6 +131,8 @@ func TestUpdateL4LoadBalancer(t *testing.T) {
g.Expect(loadBalancer.Status).To(Equal("pending"))
g.Expect(loadBalancer.Name).To(Equal("some"))
g.Expect(loadBalancer.Type).To(Equal("l4"))
g.Expect(loadBalancer.NetworkType).To(Equal("public"))
g.Expect(loadBalancer.InternalAddresses).To(BeEmpty())
g.Expect(loadBalancer.LocationID).To(Equal(int64(1)))
g.Expect(loadBalancer.LocationCode).To(Equal("location2155"))
g.Expect(loadBalancer.Labels).To(Equal(newLabels))
Expand Down Expand Up @@ -181,7 +187,9 @@ func TestCreateL7LoadBalancer(t *testing.T) {
g.Expect(loadBalancer.Type).To(Equal("l7"))
g.Expect(loadBalancer.Status).To(Equal("active"))
g.Expect(loadBalancer.Domains).To(ConsistOf("example.com", "www.example.com"))
g.Expect(loadBalancer.NetworkType).To(Equal("public"))
g.Expect(loadBalancer.ExternalAddresses).To(ConsistOf("10.0.0.1"))
g.Expect(loadBalancer.InternalAddresses).To(BeEmpty())
g.Expect(loadBalancer.LocationID).To(Equal(int64(1)))
g.Expect(loadBalancer.LocationCode).To(Equal("location2155"))
g.Expect(loadBalancer.Geoip).To(BeTrue())
Expand Down Expand Up @@ -213,6 +221,8 @@ func TestGetL7LoadBalancer(t *testing.T) {
g.Expect(loadBalancer.ID).To(Equal("y1aKReQG"))
g.Expect(loadBalancer.Name).To(Equal("name87"))
g.Expect(loadBalancer.Status).To(Equal("active"))
g.Expect(loadBalancer.NetworkType).To(Equal("public"))
g.Expect(loadBalancer.InternalAddresses).To(BeEmpty())
g.Expect(loadBalancer.StoreLogs).To(BeTrue())
g.Expect(loadBalancer.Geoip).To(BeFalse())
g.Expect(loadBalancer.Labels).To(Equal(map[string]string{"env": "test"}))
Expand Down Expand Up @@ -247,9 +257,11 @@ func TestUpdateL7LoadBalancer(t *testing.T) {
g.Expect(loadBalancer.Type).To(Equal("l7"))
g.Expect(loadBalancer.Status).To(Equal("pending"))
g.Expect(loadBalancer.Domains).To(ConsistOf("updated.example.com"))
g.Expect(loadBalancer.NetworkType).To(Equal("public"))
g.Expect(loadBalancer.ExternalAddresses).To(ConsistOf("10.0.0.1"))
g.Expect(loadBalancer.InternalAddresses).To(BeEmpty())
g.Expect(loadBalancer.StoreLogs).To(BeTrue())
g.Expect(loadBalancer.StoreLogsRegionID).To(Equal(int64(3)))
g.Expect(loadBalancer.ExternalAddresses).To(ConsistOf("10.0.0.1"))
g.Expect(loadBalancer.LocationID).To(Equal(int64(1)))
g.Expect(loadBalancer.LocationCode).To(Equal("location2155"))
g.Expect(loadBalancer.Geoip).To(BeFalse())
Expand Down
6 changes: 6 additions & 0 deletions pkg/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,9 @@ type L4LoadBalancer struct {
Name string `json:"name"`
Type string `json:"type"`
Status string `json:"status"`
NetworkType string `json:"network_type"`
ExternalAddresses []string `json:"external_addresses"`
InternalAddresses []string `json:"internal_addresses"`
LocationID int64 `json:"location_id"`
LocationCode string `json:"location_code"`
StoreLogs bool `json:"store_logs"`
Expand Down Expand Up @@ -835,6 +837,7 @@ type L4LoadBalancerUpdateInput struct {
type L4LoadBalancerCreateInput struct {
Name string `json:"name"`
LocationID int64 `json:"location_id"`
NetworkType string `json:"network_type,omitempty"`
StoreLogs *bool `json:"store_logs,omitempty"`
ClusterID *string `json:"cluster_id,omitempty"`
VHostZones []L4VHostZoneInput `json:"vhost_zones"`
Expand All @@ -849,7 +852,9 @@ type L7LoadBalancer struct {
Type string `json:"type"`
Domains []string `json:"domains"`
Status string `json:"status"`
NetworkType string `json:"network_type"`
ExternalAddresses []string `json:"external_addresses"`
InternalAddresses []string `json:"internal_addresses"`
LocationID int64 `json:"location_id"`
LocationCode string `json:"location_code"`
Geoip bool `json:"geoip"`
Expand Down Expand Up @@ -933,6 +938,7 @@ type L7LoadBalancerUpdateInput struct {
type L7LoadBalancerCreateInput struct {
Name string `json:"name"`
LocationID int64 `json:"location_id"`
NetworkType string `json:"network_type,omitempty"`
StoreLogs *bool `json:"store_logs,omitempty"`
StoreLogsRegionID *int `json:"store_logs_region_id,,omitempty"`
Geoip *bool `json:"geoip,omitempty"`
Expand Down
Loading