feat(glb monitor): added header field in output

IBM · Sep 7, 2020 · a253b8d · a253b8d
1 parent cda1816
commit a253b8d
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 20 deletions.
diff --git a/cachingapiv1/caching_api_v1_integration_test.go b/cachingapiv1/caching_api_v1_integration_test.go
@@ -9,10 +9,10 @@ import (
 	"os"
 
 	"github.com/IBM/go-sdk-core/core"
+	. "github.com/IBM/networking-go-sdk/cachingapiv1"
 	"github.com/joho/godotenv"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	. "github.com/IBM/networking-go-sdk/cachingapiv1"
 )
 
 const configFile = "../cis.env"
@@ -54,8 +54,8 @@ var _ = Describe(`cachingapiv1_test`, func() {
 	if serviceErr != nil {
 		fmt.Println(serviceErr)
 	}
-	Describe(`zoneratelimitsv1_test`, func() {
-		Context(`zoneratelimitsv1_test`, func() {
+	Describe(`cachingapiv1_test`, func() {
+		Context(`cachingapiv1_test`, func() {
 			It(`cache purge by urls`, func() {
 				shouldSkipTest()
 				cacheOpt := service.NewPurgeByUrlsOptions()

diff --git a/custompagesv1/custom_pages_v1_integration_test.go b/custompagesv1/custom_pages_v1_integration_test.go
@@ -9,10 +9,10 @@ import (
 	"os"
 
 	"github.com/IBM/go-sdk-core/core"
+	. "github.com/IBM/networking-go-sdk/custompagesv1"
 	"github.com/joho/godotenv"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	. "github.com/IBM/networking-go-sdk/custompagesv1"
 )
 
 const configFile = "../cis.env"
@@ -25,7 +25,7 @@ func shouldSkipTest() {
 	}
 }
 
-var _ = Describe(`zoneratelimitsv1`, func() {
+var _ = Describe(`custompagesv1_test`, func() {
 	if _, err := os.Stat(configFile); err != nil {
 		configLoaded = false
 	}

diff --git a/firewallapiv1/firewall_api_v1_integration_test.go b/firewallapiv1/firewall_api_v1_integration_test.go
@@ -9,10 +9,10 @@ import (
 	"os"
 
 	"github.com/IBM/go-sdk-core/core"
+	. "github.com/IBM/networking-go-sdk/firewallapiv1"
 	"github.com/joho/godotenv"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	. "github.com/IBM/networking-go-sdk/firewallapiv1"
 )
 
 const configFile = "../cis.env"
@@ -54,8 +54,8 @@ var _ = Describe(`firewallapiv1_test`, func() {
 	if serviceErr != nil {
 		fmt.Println(serviceErr)
 	}
-	Describe(`zoneratelimitsv1_test`, func() {
-		Context(`zoneratelimitsv1_test`, func() {
+	Describe(`firewallapiv1_test`, func() {
+		Context(`firewallapiv1_test`, func() {
 			It(`security level setting test`, func() {
 				shouldSkipTest()
 				values := []string{

diff --git a/globalloadbalancermonitorv1/global_load_balancer_monitor_v1.go b/globalloadbalancermonitorv1/global_load_balancer_monitor_v1.go
@@ -952,6 +952,9 @@ type MonitorPack struct {
 
 	// allow insecure.
 	AllowInsecure *bool `json:"allow_insecure,omitempty"`
+
+	// header.
+	Header map[string][]string `json:"header,omitempty"`
 }
 
 
@@ -1018,6 +1021,10 @@ func UnmarshalMonitorPack(m map[string]json.RawMessage, result interface{}) (err
 	if err != nil {
 		return
 	}
+	err = core.UnmarshalPrimitive(m, "header", &obj.Header)
+	if err != nil {
+		return
+	}
 	reflect.ValueOf(result).Elem().Set(reflect.ValueOf(obj))
 	return
 }

diff --git a/globalloadbalancermonitorv1/global_load_balancer_monitor_v1_integration_test.go b/globalloadbalancermonitorv1/global_load_balancer_monitor_v1_integration_test.go
@@ -65,7 +65,7 @@ var _ = Describe(`GlobalLoadBalancerMonitorV1`, func() {
 	if testServiceErr != nil {
 		fmt.Println(testServiceErr)
 	}
-	Describe(`CIS_Frontend_API_Spec-GLB_Monitor.yaml`, func() {
+	Describe(`GlobalLoadBalancerMonitorV1`, func() {
 		Context(`Global Load Balancer Monitor`, func() {
 			BeforeEach(func() {
 				shouldSkipTest()

diff --git a/globalloadbalancermonitorv1/global_load_balancer_monitor_v1_test.go b/globalloadbalancermonitorv1/global_load_balancer_monitor_v1_test.go
@@ -202,7 +202,7 @@ var _ = Describe(`GlobalLoadBalancerMonitorV1`, func() {
 					Expect(req.Method).To(Equal("GET"))
 					res.Header().Set("Content-type", "application/json")
 					res.WriteHeader(200)
-					fmt.Fprintf(res, `{"success": true, "errors": [["Errors"]], "messages": [["Messages"]], "result": [{"id": "f1aba936b94213e5b8dca0c0dbf1f9cc", "created_on": "2014-01-01T05:20:00.12345Z", "modified_on": "2014-01-01T05:20:00.12345Z", "type": "http", "description": "Login page monitor", "method": "GET", "port": 8080, "path": "/", "timeout": 5, "retries": 2, "interval": 60, "expected_body": "alive", "expected_codes": "2xx", "follow_redirects": true, "allow_insecure": true}], "result_info": {"page": 1, "per_page": 20, "count": 1, "total_count": 2000}}`)
+					fmt.Fprintf(res, `{"success": true, "errors": [["Errors"]], "messages": [["Messages"]], "result": [{"id": "f1aba936b94213e5b8dca0c0dbf1f9cc", "created_on": "2014-01-01T05:20:00.12345Z", "modified_on": "2014-01-01T05:20:00.12345Z", "type": "http", "description": "Login page monitor", "method": "GET", "port": 8080, "path": "/", "timeout": 5, "retries": 2, "interval": 60, "expected_body": "alive", "expected_codes": "2xx", "follow_redirects": true, "allow_insecure": true, "header": {"mapKey": ["Inner"]}}], "result_info": {"page": 1, "per_page": 20, "count": 1, "total_count": 2000}}`)
 				}))
 			})
 			It(`Invoke ListAllLoadBalancerMonitors successfully`, func() {
@@ -322,7 +322,7 @@ var _ = Describe(`GlobalLoadBalancerMonitorV1`, func() {
 					Expect(req.Method).To(Equal("POST"))
 					res.Header().Set("Content-type", "application/json")
 					res.WriteHeader(200)
-					fmt.Fprintf(res, `{"success": true, "errors": [["Errors"]], "messages": [["Messages"]], "result": {"id": "f1aba936b94213e5b8dca0c0dbf1f9cc", "created_on": "2014-01-01T05:20:00.12345Z", "modified_on": "2014-01-01T05:20:00.12345Z", "type": "http", "description": "Login page monitor", "method": "GET", "port": 8080, "path": "/", "timeout": 5, "retries": 2, "interval": 60, "expected_body": "alive", "expected_codes": "2xx", "follow_redirects": true, "allow_insecure": true}}`)
+					fmt.Fprintf(res, `{"success": true, "errors": [["Errors"]], "messages": [["Messages"]], "result": {"id": "f1aba936b94213e5b8dca0c0dbf1f9cc", "created_on": "2014-01-01T05:20:00.12345Z", "modified_on": "2014-01-01T05:20:00.12345Z", "type": "http", "description": "Login page monitor", "method": "GET", "port": 8080, "path": "/", "timeout": 5, "retries": 2, "interval": 60, "expected_body": "alive", "expected_codes": "2xx", "follow_redirects": true, "allow_insecure": true, "header": {"mapKey": ["Inner"]}}}`)
 				}))
 			})
 			It(`Invoke CreateLoadBalancerMonitor successfully`, func() {
@@ -469,7 +469,7 @@ var _ = Describe(`GlobalLoadBalancerMonitorV1`, func() {
 					Expect(req.Method).To(Equal("PUT"))
 					res.Header().Set("Content-type", "application/json")
 					res.WriteHeader(200)
-					fmt.Fprintf(res, `{"success": true, "errors": [["Errors"]], "messages": [["Messages"]], "result": {"id": "f1aba936b94213e5b8dca0c0dbf1f9cc", "created_on": "2014-01-01T05:20:00.12345Z", "modified_on": "2014-01-01T05:20:00.12345Z", "type": "http", "description": "Login page monitor", "method": "GET", "port": 8080, "path": "/", "timeout": 5, "retries": 2, "interval": 60, "expected_body": "alive", "expected_codes": "2xx", "follow_redirects": true, "allow_insecure": true}}`)
+					fmt.Fprintf(res, `{"success": true, "errors": [["Errors"]], "messages": [["Messages"]], "result": {"id": "f1aba936b94213e5b8dca0c0dbf1f9cc", "created_on": "2014-01-01T05:20:00.12345Z", "modified_on": "2014-01-01T05:20:00.12345Z", "type": "http", "description": "Login page monitor", "method": "GET", "port": 8080, "path": "/", "timeout": 5, "retries": 2, "interval": 60, "expected_body": "alive", "expected_codes": "2xx", "follow_redirects": true, "allow_insecure": true, "header": {"mapKey": ["Inner"]}}}`)
 				}))
 			})
 			It(`Invoke EditLoadBalancerMonitor successfully`, func() {
@@ -729,7 +729,7 @@ var _ = Describe(`GlobalLoadBalancerMonitorV1`, func() {
 					Expect(req.Method).To(Equal("GET"))
 					res.Header().Set("Content-type", "application/json")
 					res.WriteHeader(200)
-					fmt.Fprintf(res, `{"success": true, "errors": [["Errors"]], "messages": [["Messages"]], "result": {"id": "f1aba936b94213e5b8dca0c0dbf1f9cc", "created_on": "2014-01-01T05:20:00.12345Z", "modified_on": "2014-01-01T05:20:00.12345Z", "type": "http", "description": "Login page monitor", "method": "GET", "port": 8080, "path": "/", "timeout": 5, "retries": 2, "interval": 60, "expected_body": "alive", "expected_codes": "2xx", "follow_redirects": true, "allow_insecure": true}}`)
+					fmt.Fprintf(res, `{"success": true, "errors": [["Errors"]], "messages": [["Messages"]], "result": {"id": "f1aba936b94213e5b8dca0c0dbf1f9cc", "created_on": "2014-01-01T05:20:00.12345Z", "modified_on": "2014-01-01T05:20:00.12345Z", "type": "http", "description": "Login page monitor", "method": "GET", "port": 8080, "path": "/", "timeout": 5, "retries": 2, "interval": 60, "expected_body": "alive", "expected_codes": "2xx", "follow_redirects": true, "allow_insecure": true, "header": {"mapKey": ["Inner"]}}}`)
 				}))
 			})
 			It(`Invoke GetLoadBalancerMonitor successfully`, func() {

diff --git a/globalloadbalancerv1/global_load_balancer_v1_integration_test.go b/globalloadbalancerv1/global_load_balancer_v1_integration_test.go
@@ -11,12 +11,12 @@ import (
 	"strings"
 
 	"github.com/IBM/go-sdk-core/core"
-	"github.com/joho/godotenv"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
 	"github.com/IBM/networking-go-sdk/globalloadbalancermonitorv1"
 	"github.com/IBM/networking-go-sdk/globalloadbalancerpoolsv0"
 	. "github.com/IBM/networking-go-sdk/globalloadbalancerv1"
+	"github.com/joho/godotenv"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 )
 
 const configFile = "../cis.env"

diff --git a/zonessettingsv1/zones_settings_v1_integration_test.go b/zonessettingsv1/zones_settings_v1_integration_test.go
@@ -10,10 +10,10 @@ import (
 	"strings"
 
 	"github.com/IBM/go-sdk-core/v4/core"
+	. "github.com/IBM/networking-go-sdk/zonessettingsv1"
 	"github.com/joho/godotenv"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	. "github.com/IBM/networking-go-sdk/zonessettingsv1"
 )
 
 const configFile = "../cis.env"
@@ -26,7 +26,7 @@ func shouldSkipTest() {
 	}
 }
 
-var _ = Describe(`zoneratelimitsv1`, func() {
+var _ = Describe(`zone_settings_v1_test`, func() {
 	if _, err := os.Stat(configFile); err != nil {
 		configLoaded = false
 	}
@@ -56,8 +56,8 @@ var _ = Describe(`zoneratelimitsv1`, func() {
 	if serviceErr != nil {
 		fmt.Println(serviceErr)
 	}
-	Describe(`zoneratelimitsv1_test`, func() {
-		Context(`zoneratelimitsv1_test`, func() {
+	Describe(`zone_settings_v1_test`, func() {
+		Context(`zone_settings_v1_test`, func() {
 			It(`DNSSEC setting test`, func() {
 				shouldSkipTest()
 				getOpt := service.NewGetZoneDnssecOptions()