ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14917 from jtopjian/openstack-secgroup-numeric-protocol 

provider/openstack: Allow numerical protocols in security group rules
This commit is contained in:
Joe Topjian 2017-05-30 12:55:17 -06:00 committed by GitHub
parent d9524a71d4 d311417122
commit ff1c2b10e0
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/providers/openstack/resource_openstack_networking_secgroup_rule_v2.go
View File

@ -3,6 +3,7 @@ package openstack
import ( import (
"fmt" "fmt"
"log" "log"
"strconv"
"strings" "strings"
"time" "time"
@ -229,6 +230,8 @@ func resourceNetworkingSecGroupRuleV2DetermineEtherType(v string) rules.RuleEthe
func resourceNetworkingSecGroupRuleV2DetermineProtocol(v string) rules.RuleProtocol { func resourceNetworkingSecGroupRuleV2DetermineProtocol(v string) rules.RuleProtocol {
var protocol rules.RuleProtocol var protocol rules.RuleProtocol
// Check and see if the requested protocol matched a list of known protocol names.
switch v { switch v {
case "tcp": case "tcp":
protocol = rules.ProtocolTCP protocol = rules.ProtocolTCP
@ -274,6 +277,14 @@ func resourceNetworkingSecGroupRuleV2DetermineProtocol(v string) rules.RuleProto
protocol = rules.ProtocolVRRP protocol = rules.ProtocolVRRP
} }
// If the protocol wasn't matched above, see if it's an integer.
if protocol == "" {
_, err := strconv.Atoi(v)
if err == nil {
protocol = rules.RuleProtocol(v)
}
}
return protocol return protocol
} }

41
builtin/providers/openstack/resource_openstack_networking_secgroup_rule_v2_test.go
View File

@ -194,6 +194,30 @@ func TestAccNetworkingV2SecGroupRule_protocols(t *testing.T) {
}) })
} }
func TestAccNetworkingV2SecGroupRule_numericProtocol(t *testing.T) {
var secgroup_1 groups.SecGroup
var secgroup_rule_1 rules.SecGroupRule
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckNetworkingV2SecGroupRuleDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccNetworkingV2SecGroupRule_numericProtocol,
Check: resource.ComposeTestCheckFunc(
testAccCheckNetworkingV2SecGroupExists(
"openstack_networking_secgroup_v2.secgroup_1", &secgroup_1),
testAccCheckNetworkingV2SecGroupRuleExists(
"openstack_networking_secgroup_rule_v2.secgroup_rule_1", &secgroup_rule_1),
resource.TestCheckResourceAttr(
"openstack_networking_secgroup_rule_v2.secgroup_rule_1", "protocol", "115"),
),
},
},
})
}
func testAccCheckNetworkingV2SecGroupRuleDestroy(s *terraform.State) error { func testAccCheckNetworkingV2SecGroupRuleDestroy(s *terraform.State) error {
config := testAccProvider.Meta().(*Config) config := testAccProvider.Meta().(*Config)
networkingClient, err := config.networkingV2Client(OS_REGION_NAME) networkingClient, err := config.networkingV2Client(OS_REGION_NAME)
@ -486,3 +510,20 @@ resource "openstack_networking_secgroup_rule_v2" "secgroup_rule_vrrp" {
security_group_id = "${openstack_networking_secgroup_v2.secgroup_1.id}" security_group_id = "${openstack_networking_secgroup_v2.secgroup_1.id}"
} }
` `
const testAccNetworkingV2SecGroupRule_numericProtocol = `
resource "openstack_networking_secgroup_v2" "secgroup_1" {
name = "secgroup_1"
description = "terraform security group rule acceptance test"
}
resource "openstack_networking_secgroup_rule_v2" "secgroup_rule_1" {
direction = "ingress"
ethertype = "IPv4"
port_range_max = 22
port_range_min = 22
protocol = "115"
remote_ip_prefix = "0.0.0.0/0"
security_group_id = "${openstack_networking_secgroup_v2.secgroup_1.id}"
}
`