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

Jump to bottom

[AutoPR network/resource-manager/frontdoor/resource-manager] Merge Network release branch into master #4062

Closed
wants to merge 6 commits into from
Closed

[AutoPR network/resource-manager/frontdoor/resource-manager] Merge Network release branch into master #4062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af5c37a
Generated from 7da6f1df387d4d302afafb5ef2decc3aa78cefa6
AutorestCI Jan 9, 2019
390818b
Generated from bca2d5a2e5ba4e811726278d8f9d7e81b1a528e0 (#3828)
AutorestCI Jan 9, 2019
94ff24f
[AutoPR network/resource-manager] Adding the structure of ruleSequenc…
AutorestCI Jan 22, 2019
c3d2ae5
Generated from e7a48d7fa1c467ebebe4d66df99c1c6e85822e43
AutorestCI Feb 5, 2019
0adf676
Generated from e7a48d7fa1c467ebebe4d66df99c1c6e85822e43
AutorestCI Feb 11, 2019
b97313a
Generated from b616d58088e9bae2ae17a9e8c2c9a6ca899697b2
AutorestCI Feb 11, 2019
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
86 changes: 77 additions & 9 deletions profiles/latest/network/mgmt/network/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package network
import (
"context"

original "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-10-01/network"
original "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-12-01/network"
)

const (
Expand Down Expand Up @@ -220,10 +220,19 @@ const (
type AzureFirewallRCActionType = original.AzureFirewallRCActionType

const (
AzureFirewallRCActionTypeAlert AzureFirewallRCActionType = original.AzureFirewallRCActionTypeAlert
AzureFirewallRCActionTypeAllow AzureFirewallRCActionType = original.AzureFirewallRCActionTypeAllow
AzureFirewallRCActionTypeDeny AzureFirewallRCActionType = original.AzureFirewallRCActionTypeDeny
)

type AzureFirewallThreatIntelMode = original.AzureFirewallThreatIntelMode

const (
AzureFirewallThreatIntelModeAlert AzureFirewallThreatIntelMode = original.AzureFirewallThreatIntelModeAlert
AzureFirewallThreatIntelModeDeny AzureFirewallThreatIntelMode = original.AzureFirewallThreatIntelModeDeny
AzureFirewallThreatIntelModeOff AzureFirewallThreatIntelMode = original.AzureFirewallThreatIntelModeOff
)

type BgpPeerState = original.BgpPeerState

const (
Expand All @@ -245,9 +254,9 @@ const (
type ConnectionMonitorSourceStatus = original.ConnectionMonitorSourceStatus

const (
Active ConnectionMonitorSourceStatus = original.Active
Inactive ConnectionMonitorSourceStatus = original.Inactive
Uknown ConnectionMonitorSourceStatus = original.Uknown
ConnectionMonitorSourceStatusActive ConnectionMonitorSourceStatus = original.ConnectionMonitorSourceStatusActive
ConnectionMonitorSourceStatusInactive ConnectionMonitorSourceStatus = original.ConnectionMonitorSourceStatusInactive
ConnectionMonitorSourceStatusUnknown ConnectionMonitorSourceStatus = original.ConnectionMonitorSourceStatusUnknown
)

type ConnectionState = original.ConnectionState
Expand All @@ -267,6 +276,23 @@ const (
ConnectionStatusUnknown ConnectionStatus = original.ConnectionStatusUnknown
)

type DdosCustomPolicyProtocol = original.DdosCustomPolicyProtocol

const (
DdosCustomPolicyProtocolSyn DdosCustomPolicyProtocol = original.DdosCustomPolicyProtocolSyn
DdosCustomPolicyProtocolTCP DdosCustomPolicyProtocol = original.DdosCustomPolicyProtocolTCP
DdosCustomPolicyProtocolUDP DdosCustomPolicyProtocol = original.DdosCustomPolicyProtocolUDP
)

type DdosCustomPolicyTriggerSensitivityOverride = original.DdosCustomPolicyTriggerSensitivityOverride

const (
Default DdosCustomPolicyTriggerSensitivityOverride = original.Default
High DdosCustomPolicyTriggerSensitivityOverride = original.High
Low DdosCustomPolicyTriggerSensitivityOverride = original.Low
Relaxed DdosCustomPolicyTriggerSensitivityOverride = original.Relaxed
)

type DhGroup = original.DhGroup

const (
Expand Down Expand Up @@ -299,8 +325,8 @@ const (
type EffectiveRouteState = original.EffectiveRouteState

const (
EffectiveRouteStateActive EffectiveRouteState = original.EffectiveRouteStateActive
EffectiveRouteStateInvalid EffectiveRouteState = original.EffectiveRouteStateInvalid
Active EffectiveRouteState = original.Active
Invalid EffectiveRouteState = original.Invalid
)

type EffectiveSecurityRuleProtocol = original.EffectiveSecurityRuleProtocol
Expand Down Expand Up @@ -500,9 +526,9 @@ const (
type LoadDistribution = original.LoadDistribution

const (
Default LoadDistribution = original.Default
SourceIP LoadDistribution = original.SourceIP
SourceIPProtocol LoadDistribution = original.SourceIPProtocol
LoadDistributionDefault LoadDistribution = original.LoadDistributionDefault
LoadDistributionSourceIP LoadDistribution = original.LoadDistributionSourceIP
LoadDistributionSourceIPProtocol LoadDistribution = original.LoadDistributionSourceIPProtocol
)

type NextHopType = original.NextHopType
Expand Down Expand Up @@ -598,6 +624,13 @@ const (
X86 ProcessorArchitecture = original.X86
)

type ProtectionCoverage = original.ProtectionCoverage

const (
ProtectionCoverageBasic ProtectionCoverage = original.ProtectionCoverageBasic
ProtectionCoverageStandard ProtectionCoverage = original.ProtectionCoverageStandard
)

type Protocol = original.Protocol

const (
Expand Down Expand Up @@ -885,6 +918,7 @@ type ApplicationGatewayRequestRoutingRule = original.ApplicationGatewayRequestRo
type ApplicationGatewayRequestRoutingRulePropertiesFormat = original.ApplicationGatewayRequestRoutingRulePropertiesFormat
type ApplicationGatewayRewriteRule = original.ApplicationGatewayRewriteRule
type ApplicationGatewayRewriteRuleActionSet = original.ApplicationGatewayRewriteRuleActionSet
type ApplicationGatewayRewriteRuleCondition = original.ApplicationGatewayRewriteRuleCondition
type ApplicationGatewayRewriteRuleSet = original.ApplicationGatewayRewriteRuleSet
type ApplicationGatewayRewriteRuleSetPropertiesFormat = original.ApplicationGatewayRewriteRuleSetPropertiesFormat
type ApplicationGatewaySku = original.ApplicationGatewaySku
Expand Down Expand Up @@ -913,6 +947,7 @@ type ApplicationSecurityGroupPropertiesFormat = original.ApplicationSecurityGrou
type ApplicationSecurityGroupsClient = original.ApplicationSecurityGroupsClient
type ApplicationSecurityGroupsCreateOrUpdateFuture = original.ApplicationSecurityGroupsCreateOrUpdateFuture
type ApplicationSecurityGroupsDeleteFuture = original.ApplicationSecurityGroupsDeleteFuture
type ApplicationSecurityGroupsUpdateTagsFuture = original.ApplicationSecurityGroupsUpdateTagsFuture
type AuthorizationListResult = original.AuthorizationListResult
type AuthorizationListResultIterator = original.AuthorizationListResultIterator
type AuthorizationListResultPage = original.AuthorizationListResultPage
Expand Down Expand Up @@ -977,6 +1012,8 @@ type BgpServiceCommunityListResultIterator = original.BgpServiceCommunityListRes
type BgpServiceCommunityListResultPage = original.BgpServiceCommunityListResultPage
type BgpServiceCommunityPropertiesFormat = original.BgpServiceCommunityPropertiesFormat
type BgpSettings = original.BgpSettings
type CloudError = original.CloudError
type CloudErrorBody = original.CloudErrorBody
type ConfigurationDiagnosticParameters = original.ConfigurationDiagnosticParameters
type ConfigurationDiagnosticProfile = original.ConfigurationDiagnosticProfile
type ConfigurationDiagnosticResponse = original.ConfigurationDiagnosticResponse
Expand Down Expand Up @@ -1012,6 +1049,12 @@ type ContainerNetworkInterfaceIPConfiguration = original.ContainerNetworkInterfa
type ContainerNetworkInterfaceIPConfigurationPropertiesFormat = original.ContainerNetworkInterfaceIPConfigurationPropertiesFormat
type ContainerNetworkInterfacePropertiesFormat = original.ContainerNetworkInterfacePropertiesFormat
type DNSNameAvailabilityResult = original.DNSNameAvailabilityResult
type DdosCustomPoliciesClient = original.DdosCustomPoliciesClient
type DdosCustomPoliciesCreateOrUpdateFuture = original.DdosCustomPoliciesCreateOrUpdateFuture
type DdosCustomPoliciesDeleteFuture = original.DdosCustomPoliciesDeleteFuture
type DdosCustomPoliciesUpdateTagsFuture = original.DdosCustomPoliciesUpdateTagsFuture
type DdosCustomPolicy = original.DdosCustomPolicy
type DdosCustomPolicyPropertiesFormat = original.DdosCustomPolicyPropertiesFormat
type DdosProtectionPlan = original.DdosProtectionPlan
type DdosProtectionPlanListResult = original.DdosProtectionPlanListResult
type DdosProtectionPlanListResultIterator = original.DdosProtectionPlanListResultIterator
Expand All @@ -1020,6 +1063,7 @@ type DdosProtectionPlanPropertiesFormat = original.DdosProtectionPlanPropertiesF
type DdosProtectionPlansClient = original.DdosProtectionPlansClient
type DdosProtectionPlansCreateOrUpdateFuture = original.DdosProtectionPlansCreateOrUpdateFuture
type DdosProtectionPlansDeleteFuture = original.DdosProtectionPlansDeleteFuture
type DdosSettings = original.DdosSettings
type DefaultSecurityRulesClient = original.DefaultSecurityRulesClient
type Delegation = original.Delegation
type DeviceProperties = original.DeviceProperties
Expand Down Expand Up @@ -1179,6 +1223,8 @@ type InboundNatRulePropertiesFormat = original.InboundNatRulePropertiesFormat
type InboundNatRulesClient = original.InboundNatRulesClient
type InboundNatRulesCreateOrUpdateFuture = original.InboundNatRulesCreateOrUpdateFuture
type InboundNatRulesDeleteFuture = original.InboundNatRulesDeleteFuture
type IntentPolicy = original.IntentPolicy
type IntentPolicyConfiguration = original.IntentPolicyConfiguration
type Interface = original.Interface
type InterfaceAssociation = original.InterfaceAssociation
type InterfaceDNSSettings = original.InterfaceDNSSettings
Expand Down Expand Up @@ -1229,6 +1275,7 @@ type ListP2SVpnGatewaysResultPage = original.ListP2SVpnGatewaysResultPage
type ListP2SVpnServerConfigurationsResult = original.ListP2SVpnServerConfigurationsResult
type ListP2SVpnServerConfigurationsResultIterator = original.ListP2SVpnServerConfigurationsResultIterator
type ListP2SVpnServerConfigurationsResultPage = original.ListP2SVpnServerConfigurationsResultPage
type ListString = original.ListString
type ListVirtualHubsResult = original.ListVirtualHubsResult
type ListVirtualHubsResultIterator = original.ListVirtualHubsResultIterator
type ListVirtualHubsResultPage = original.ListVirtualHubsResultPage
Expand Down Expand Up @@ -1339,6 +1386,7 @@ type PacketCapturesGetStatusFuture = original.PacketCapturesGetStatusFuture
type PacketCapturesStopFuture = original.PacketCapturesStopFuture
type PatchRouteFilter = original.PatchRouteFilter
type PatchRouteFilterRule = original.PatchRouteFilterRule
type PrepareNetworkPoliciesRequest = original.PrepareNetworkPoliciesRequest
type Probe = original.Probe
type ProbePropertiesFormat = original.ProbePropertiesFormat
type Profile = original.Profile
Expand All @@ -1348,6 +1396,7 @@ type ProfileListResultPage = original.ProfileListResultPage
type ProfilePropertiesFormat = original.ProfilePropertiesFormat
type ProfilesClient = original.ProfilesClient
type ProtocolConfiguration = original.ProtocolConfiguration
type ProtocolCustomSettingsFormat = original.ProtocolCustomSettingsFormat
type PublicIPAddress = original.PublicIPAddress
type PublicIPAddressDNSSettings = original.PublicIPAddressDNSSettings
type PublicIPAddressListResult = original.PublicIPAddressListResult
Expand Down Expand Up @@ -1465,6 +1514,7 @@ type SubnetPropertiesFormat = original.SubnetPropertiesFormat
type SubnetsClient = original.SubnetsClient
type SubnetsCreateOrUpdateFuture = original.SubnetsCreateOrUpdateFuture
type SubnetsDeleteFuture = original.SubnetsDeleteFuture
type SubnetsPrepareNetworkPoliciesFuture = original.SubnetsPrepareNetworkPoliciesFuture
type TagsObject = original.TagsObject
type Topology = original.Topology
type TopologyAssociation = original.TopologyAssociation
Expand Down Expand Up @@ -1725,6 +1775,12 @@ func NewConnectionMonitorsClient(subscriptionID string) ConnectionMonitorsClient
func NewConnectionMonitorsClientWithBaseURI(baseURI string, subscriptionID string) ConnectionMonitorsClient {
return original.NewConnectionMonitorsClientWithBaseURI(baseURI, subscriptionID)
}
func NewDdosCustomPoliciesClient(subscriptionID string) DdosCustomPoliciesClient {
return original.NewDdosCustomPoliciesClient(subscriptionID)
}
func NewDdosCustomPoliciesClientWithBaseURI(baseURI string, subscriptionID string) DdosCustomPoliciesClient {
return original.NewDdosCustomPoliciesClientWithBaseURI(baseURI, subscriptionID)
}
func NewDdosProtectionPlanListResultIterator(page DdosProtectionPlanListResultPage) DdosProtectionPlanListResultIterator {
return original.NewDdosProtectionPlanListResultIterator(page)
}
Expand Down Expand Up @@ -2460,6 +2516,9 @@ func PossibleAzureFirewallNetworkRuleProtocolValues() []AzureFirewallNetworkRule
func PossibleAzureFirewallRCActionTypeValues() []AzureFirewallRCActionType {
return original.PossibleAzureFirewallRCActionTypeValues()
}
func PossibleAzureFirewallThreatIntelModeValues() []AzureFirewallThreatIntelMode {
return original.PossibleAzureFirewallThreatIntelModeValues()
}
func PossibleBgpPeerStateValues() []BgpPeerState {
return original.PossibleBgpPeerStateValues()
}
Expand All @@ -2475,6 +2534,12 @@ func PossibleConnectionStateValues() []ConnectionState {
func PossibleConnectionStatusValues() []ConnectionStatus {
return original.PossibleConnectionStatusValues()
}
func PossibleDdosCustomPolicyProtocolValues() []DdosCustomPolicyProtocol {
return original.PossibleDdosCustomPolicyProtocolValues()
}
func PossibleDdosCustomPolicyTriggerSensitivityOverrideValues() []DdosCustomPolicyTriggerSensitivityOverride {
return original.PossibleDdosCustomPolicyTriggerSensitivityOverrideValues()
}
func PossibleDhGroupValues() []DhGroup {
return original.PossibleDhGroupValues()
}
Expand Down Expand Up @@ -2589,6 +2654,9 @@ func PossibleProbeProtocolValues() []ProbeProtocol {
func PossibleProcessorArchitectureValues() []ProcessorArchitecture {
return original.PossibleProcessorArchitectureValues()
}
func PossibleProtectionCoverageValues() []ProtectionCoverage {
return original.PossibleProtectionCoverageValues()
}
func PossibleProtocol1Values() []Protocol1 {
return original.PossibleProtocol1Values()
}
Expand Down
3 changes: 2 additions & 1 deletion profiles/latest/network/mgmt/network/networkapi/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package networkapi

import original "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-10-01/network/networkapi"
import original "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-12-01/network/networkapi"

type ApplicationGatewaysClientAPI = original.ApplicationGatewaysClientAPI
type ApplicationSecurityGroupsClientAPI = original.ApplicationSecurityGroupsClientAPI
Expand All @@ -31,6 +31,7 @@ type AzureFirewallsClientAPI = original.AzureFirewallsClientAPI
type BaseClientAPI = original.BaseClientAPI
type BgpServiceCommunitiesClientAPI = original.BgpServiceCommunitiesClientAPI
type ConnectionMonitorsClientAPI = original.ConnectionMonitorsClientAPI
type DdosCustomPoliciesClientAPI = original.DdosCustomPoliciesClientAPI
type DdosProtectionPlansClientAPI = original.DdosProtectionPlansClientAPI
type DefaultSecurityRulesClientAPI = original.DefaultSecurityRulesClientAPI
type ExpressRouteCircuitAuthorizationsClientAPI = original.ExpressRouteCircuitAuthorizationsClientAPI
Expand Down
Loading