Skip to content

Commit

Permalink
Merge pull request #208 from citrix/release_prep
Browse files Browse the repository at this point in the history
Release prep
  • Loading branch information
George Nikolopoulos authored Sep 14, 2021
2 parents b10474d + 9b08e8b commit 93b6774
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ dist/
.vscode/
tf.log
*.plan
.terraform.lock.hcl
33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
## 1.6.0 (September 14, 2021)

FEATURES

* **New Resource** `botpolicy`
* **New Resource** `botpolicylabel`
* **New Resource** `botprofile`
* **New Resource** `botsettings`
* **New Resource** `lbgroup`
* **New Resource** `lbgroup_lbvserver_binding`
* **New Resource** `lbmetrictable`
* **New Resource** `lbmonitor_metric_binding`
* **New Resource** `lbmonitor_sslcertkey_binding`
* **New Resource** `lbprofile`
* **New Resource** `lbroute`
* **New Resource** `lbroute6`
* **New Resource** `lbsipparameters`
* **New Resource** `lbvserver_analyticsprofile_binding`
* **New Resource** `lbvserver_appflowpolicy_binding`
* **New Resource** `lbvserver_appqoepolicy_binding`
* **New Resource** `lbvserver_auditsyslogpolicy_binding`
* **New Resource** `lbvserver_authorizationpolicy_binding`
* **New Resource** `lbvserver_botpolicy_binding`
* **New Resource** `lbvserver_cachepolicy_binding`
* **New Resource** `lbvserver_contentinspectionpolicy_binding`
* **New Resource** `lbvserver_dnspolicy64_binding`
* **New Resource** `lbvserver_feopolicy_binding`
* **New Resource** `lbvserver_spilloverpolicy_binding`
* **New Resource** `lbvserver_tmtrafficpolicy_binding`
* **New Resource** `lbvserver_videooptimizationdetectionpolicy_binding`
* **New Resource** `lbvserver_videooptimizationpacingpolicy_binding`
* **New Resource** `sslcacertgroup`

## 1.5.0 (July 16, 2021)

ENHANCEMENTS
Expand Down
19 changes: 15 additions & 4 deletions citrixadc/resource_citrixadc_lbmonitor_metric_binding_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,21 @@ import (
"github.com/hashicorp/terraform/terraform"
)

// Need the following cli commands since no resource yet exists
// add lb metricTable tab1
// bind metrictable tab1 metric1 1.3.6.1.4.1.5951.4.1.1.8.0

const testAccLbmonitor_metric_binding_basic = `
resource "citrixadc_lbmonitor" "tfmonitor1" {
monitorname = "tf-monitor1"
type = "LOAD"
metrictable = "tab1"
}
resource citrixadc_lbmonitor_metric_binding tf_acclbmonitor_metric_binding {
monitorname = "mload2"
metric = "metric2"
monitorname = citrixadc_lbmonitor.tfmonitor1.monitorname
metric = "metric1"
metricthreshold = 100
}
`
Expand All @@ -47,8 +58,8 @@ func TestAccLbmonitor_metric_binding_basic(t *testing.T) {
Config: testAccLbmonitor_metric_binding_basic,
Check: resource.ComposeTestCheckFunc(
testAccCheckLbmonitor_metric_bindingExist("citrixadc_lbmonitor_metric_binding.tf_acclbmonitor_metric_binding", nil),
resource.TestCheckResourceAttr("citrixadc_lbmonitor_metric_binding.tf_acclbmonitor_metric_binding", "monitorname", "mload2"),
resource.TestCheckResourceAttr("citrixadc_lbmonitor_metric_binding.tf_acclbmonitor_metric_binding", "metric", "metric2"),
resource.TestCheckResourceAttr("citrixadc_lbmonitor_metric_binding.tf_acclbmonitor_metric_binding", "monitorname", "tf-monitor1"),
resource.TestCheckResourceAttr("citrixadc_lbmonitor_metric_binding.tf_acclbmonitor_metric_binding", "metric", "metric1"),
resource.TestCheckResourceAttr("citrixadc_lbmonitor_metric_binding.tf_acclbmonitor_metric_binding", "metricthreshold", "100"),
),
},
Expand Down
15 changes: 13 additions & 2 deletions examples/lbmonitor_metric_binding/resources.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
# Need the following cli commands since no resource yet exists
# add lb metricTable tab1
# bind metrictable tab1 metric1 1.3.6.1.4.1.5951.4.1.1.8.0
# add lb monitor mload1 LOAD

resource "citrixadc_lbmonitor" "tfmonitor1" {
monitorname = "tf-monitor1"
type = "LOAD"
metrictable = "tab1"
}

resource citrixadc_lbmonitor_metric_binding demo_binding1 {
monitorname = "mload2"
metric = "demometric"
monitorname = citrixadc_lbmonitor.tfmonitor1.monitorname
metric = "metric1"
metricthreshold = 100
}

Expand Down

0 comments on commit 93b6774

Please sign in to comment.