Skip to content
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

VDI Support #220

Merged
merged 8 commits into from
Jan 21, 2021
Merged

VDI Support #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
19f3a46
feat: update network security rule structs
marinsalinas Dec 3, 2020
9028c8b
refactor: make rule code re-usable
marinsalinas Dec 3, 2020
3d83d07
feat: add ad_rule argument support
marinsalinas Dec 4, 2020
b532ed0
chore: remove unessesary trailing line
marinsalinas Dec 4, 2020
9823350
feat: add ad_rule to security network rule data source
marinsalinas Dec 9, 2020
f5707a3
feat: add missing attributes to network_security_rule resource and da…
marinsalinas Dec 9, 2020
d2bd539
test: add test case for vdi fule
marinsalinas Dec 10, 2020
a116f08
chore: add vdi related attributes to network_security rule wensite doc
marinsalinas Jan 11, 2021
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
47 changes: 18 additions & 29 deletions client/v3/v3_structs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1551,32 +1551,18 @@ type NetworkRuleIcmpTypeCodeList struct {

// NetworkRule ...
type NetworkRule struct {

// Timestamp of expiration time.
ExpirationTime *string `json:"expiration_time,omitempty" mapstructure:"expiration_time,omitempty"`

// The set of categories that matching VMs need to have.
Filter *CategoryFilter `json:"filter,omitempty" mapstructure:"filter,omitempty"`

// List of ICMP types and codes allowed by this rule.
IcmpTypeCodeList []*NetworkRuleIcmpTypeCodeList `json:"icmp_type_code_list,omitempty" mapstructure:"icmp_type_code_list,omitempty"`

IPSubnet *IPSubnet `json:"ip_subnet,omitempty" mapstructure:"ip_subnet,omitempty"`

NetworkFunctionChainReference *Reference `json:"network_function_chain_reference,omitempty" mapstructure:"network_function_chain_reference,omitempty"`

// The set of categories that matching VMs need to have.
PeerSpecificationType *string `json:"peer_specification_type,omitempty" mapstructure:"peer_specification_type,omitempty"`

// Select a protocol to allow. Multiple protocols can be allowed by repeating network_rule object. If a protocol
// is not configured in the network_rule object then it is allowed.
Protocol *string `json:"protocol,omitempty" mapstructure:"protocol,omitempty"`

// List of TCP ports that are allowed by this rule.
TCPPortRangeList []*PortRange `json:"tcp_port_range_list,omitempty" mapstructure:"tcp_port_range_list,omitempty"`

// List of UDP ports that are allowed by this rule.
UDPPortRangeList []*PortRange `json:"udp_port_range_list,omitempty" mapstructure:"udp_port_range_list,omitempty"`
ExpirationTime *string `json:"expiration_time,omitempty" mapstructure:"expiration_time,omitempty"`
Filter *CategoryFilter `json:"filter,omitempty" mapstructure:"filter,omitempty"`
IcmpTypeCodeList []*NetworkRuleIcmpTypeCodeList `json:"icmp_type_code_list,omitempty" mapstructure:"icmp_type_code_list,omitempty"`
IPSubnet *IPSubnet `json:"ip_subnet,omitempty" mapstructure:"ip_subnet,omitempty"`
NetworkFunctionChainReference *Reference `json:"network_function_chain_reference,omitempty" mapstructure:"network_function_chain_reference,omitempty"`
PeerSpecificationType *string `json:"peer_specification_type,omitempty" mapstructure:"peer_specification_type,omitempty"`
Protocol *string `json:"protocol,omitempty" mapstructure:"protocol,omitempty"`
TCPPortRangeList []*PortRange `json:"tcp_port_range_list,omitempty" mapstructure:"tcp_port_range_list,omitempty"`
UDPPortRangeList []*PortRange `json:"udp_port_range_list,omitempty" mapstructure:"udp_port_range_list,omitempty"`
AddressGroupInclusionList []*Reference `json:"address_group_inclusion_list,omitempty" mapstructure:"address_group_inclusion_list,omitempty"`
Description *string `json:"description,omitempty" mapstructure:"description,omitempty"`
ServiceGroupList []*Reference `json:"service_group_list,omitempty" mapstructure:"service_group_list,omitempty"`
}

// TargetGroup ...
Expand Down Expand Up @@ -1611,9 +1597,12 @@ type NetworkSecurityRuleIsolationRule struct {

// NetworkSecurityRuleResources ...
type NetworkSecurityRuleResources struct {
AppRule *NetworkSecurityRuleResourcesRule `json:"app_rule,omitempty" mapstructure:"app_rule,omitempty"`
IsolationRule *NetworkSecurityRuleIsolationRule `json:"isolation_rule,omitempty" mapstructure:"isolation_rule,omitempty"`
QuarantineRule *NetworkSecurityRuleResourcesRule `json:"quarantine_rule,omitempty" mapstructure:"quarantine_rule,omitempty"`
AllowIpv6Traffic *bool `json:"allow_ipv6_traffic,omitempty" mapstructure:"allow_ipv6_traffic,omitempty"`
IsPolicyHitlogEnabled *bool `json:"is_policy_hitlog_enabled,omitempty" mapstructure:"is_policy_hitlog_enabled,omitempty"`
AdRule *NetworkSecurityRuleResourcesRule `json:"ad_rule,omitempty" mapstructure:"ad_rule,omitempty"`
AppRule *NetworkSecurityRuleResourcesRule `json:"app_rule,omitempty" mapstructure:"app_rule,omitempty"`
IsolationRule *NetworkSecurityRuleIsolationRule `json:"isolation_rule,omitempty" mapstructure:"isolation_rule,omitempty"`
QuarantineRule *NetworkSecurityRuleResourcesRule `json:"quarantine_rule,omitempty" mapstructure:"quarantine_rule,omitempty"`
}

// NetworkSecurityRule ...
Expand Down
Loading