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

Mgmt network supports priority #29503

Merged
merged 15 commits into from
Jun 22, 2022
Merged

Mgmt network supports priority #29503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fbcbfbb
codegen
XiaofeiCao Jun 16, 2022
446ceee
changelog for version update
XiaofeiCao Jun 15, 2022
d365abb
supports priority
XiaofeiCao Jun 16, 2022
eb945a9
session-records
XiaofeiCao Jun 14, 2022
c7e0afc
related session-records
XiaofeiCao Jun 15, 2022
da61f29
changelog for feature
XiaofeiCao Jun 15, 2022
96d7689
revapi.skip=true
XiaofeiCao Jun 15, 2022
a285dd2
nit, remove spaces
XiaofeiCao Jun 16, 2022
4dca56c
Update sdk/resourcemanager/azure-resourcemanager-network/src/main/jav…
XiaofeiCao Jun 16, 2022
82c7be4
fix doc
XiaofeiCao Jun 17, 2022
718ae74
code refactor and fix javadoc
XiaofeiCao Jun 17, 2022
7d5c4fe
fix javadoc
XiaofeiCao Jun 17, 2022
631dc1a
exclude samples from code coverage report
XiaofeiCao Jun 21, 2022
6030c07
make exclude projects an argument of the script
XiaofeiCao Jun 22, 2022
8bae78a
rename script parameter
XiaofeiCao Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 4 additions & 1 deletion eng/pipelines/templates/steps/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ parameters:
- name: IsLiveTest
type: boolean
default: false
- name: ExcludeProjectList
type: string
default: 'com.azure.resourcemanager:azure-resourcemanager-samples'

steps:
- task: Maven@3
Expand Down Expand Up @@ -71,7 +74,7 @@ steps:
condition: and(eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['JavaTestVersion'], '1.11'), eq('${{ parameters.SDKType }}', 'client'), eq('${{ parameters.SkipAggregateReports }}', 'false'))
inputs:
scriptPath: 'eng/scripts/generate_aggregate_coverage_pom.py'
arguments: '--project-list $(ProjectList)'
arguments: '--project-list $(ProjectList) --exclude-project-list ${{ parameters.ExcludeProjectList }}'
workingDirectory: '$(System.DefaultWorkingDirectory)'

- task: Maven@3
Expand Down
12 changes: 10 additions & 2 deletions eng/scripts/generate_aggregate_coverage_pom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@

include_groups = []

exclude_projects = []

# From this file get to the root path of the repo.
root_path = os.path.normpath(os.path.abspath(__file__) + '/../../../')

Expand Down Expand Up @@ -61,7 +63,7 @@
'''


def create_aggregate_coverage_pom(project_list: str, groups: str):
def create_aggregate_coverage_pom(project_list: str, groups: str, exclude_project_list: str):

if groups is None:
include_groups.append('com.azure')
Expand All @@ -71,6 +73,10 @@ def create_aggregate_coverage_pom(project_list: str, groups: str):
for group in groups.split(','):
include_groups.append(group)

if exclude_project_list is not None:
for exclude_project in exclude_project_list.split(','):
exclude_projects.append(exclude_project)

# Get the artifact identifiers from client_versions.txt to act as our source of truth.
artifact_identifier_to_version = load_client_artifact_identifiers()

Expand Down Expand Up @@ -144,6 +150,7 @@ def create_project_for_pom(pom_path: str, project_list_identifiers: list):

# If the project isn't a track 2 POM skip it and not one of the project list identifiers.
if not project_identifier in project_list_identifiers \
or project_identifier in exclude_projects \
or parent_pom not in valid_parents \
or group_id.text not in include_groups:
return
Expand Down Expand Up @@ -194,9 +201,10 @@ def main():
parser = argparse.ArgumentParser(description='Generated a POM for creating an aggregate code coverage report.')
parser.add_argument('--project-list', '--pl', type=str)
parser.add_argument('--groups', '--g', type=str)
parser.add_argument('--exclude-project-list', '--epl', type=str)
args = parser.parse_args()
start_time = time.time()
create_aggregate_coverage_pom(args.project_list, args.groups)
create_aggregate_coverage_pom(args.project_list, args.groups, args.exclude_project_list)
elapsed_time = time.time() - start_time

print('Effective POM File for aggregate code coverage')
Expand Down
2 changes: 1 addition & 1 deletion sdk/resourcemanager/api-specs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
"dir": "azure-resourcemanager-network",
"source": "specification/network/resource-manager/readme.md",
"package": "com.azure.resourcemanager.network",
"args": "--tag=package-2021-05 --add-inner=ApplicationGatewayIpConfiguration,ApplicationGatewayPathRule,ApplicationGatewayProbe,ApplicationGatewayRedirectConfiguration,ApplicationGatewayRequestRoutingRule,ApplicationGatewaySslCertificate,ApplicationGatewayUrlPathMap,ApplicationGatewayAuthenticationCertificate,VirtualNetworkGatewayIpConfiguration,ConnectionMonitor,PacketCapture"
"args": "--tag=package-2021-08 --add-inner=ApplicationGatewayIpConfiguration,ApplicationGatewayPathRule,ApplicationGatewayProbe,ApplicationGatewayRedirectConfiguration,ApplicationGatewayRequestRoutingRule,ApplicationGatewaySslCertificate,ApplicationGatewayUrlPathMap,ApplicationGatewayAuthenticationCertificate,VirtualNetworkGatewayIpConfiguration,ConnectionMonitor,PacketCapture,ApplicationGateway,ApplicationGatewayListener"
},
"network-hybrid": {
"dir": "../resourcemanagerhybrid/azure-resourcemanager-network",
Expand Down
20 changes: 10 additions & 10 deletions .../session-records/SharedGalleryImageTests.canCreateUpdateGetDeleteGalleryImageVersion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
"Exception" : null
}, {
"Method" : "PUT",
"Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/virtualNetworks/vnet642709b1e5?api-version=2021-05-01",
"Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/virtualNetworks/vnet642709b1e5?api-version=2021-08-01",
"Headers" : {
"User-Agent" : "azsdk-java-com.azure.resourcemanager.network/2.16.0-beta.1 (17.0.1; Windows 11; 10.0)",
"x-ms-client-request-id" : "5f01359c-1273-4ea1-8302-25c94414a2be",
Expand All @@ -253,7 +253,7 @@
"Retry-After" : "0",
"x-ms-routing-request-id" : "SOUTHEASTASIA:20220608T034110Z:94ea9cb6-f4ef-43d5-9cc2-1ced7d4fc783",
"Expires" : "-1",
"Azure-AsyncOperation" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westcentralus/operations/429e2126-4e09-4d8a-896c-aada87fe86e8?api-version=2021-05-01",
"Azure-AsyncOperation" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westcentralus/operations/429e2126-4e09-4d8a-896c-aada87fe86e8?api-version=2021-08-01",
"x-ms-request-id" : "429e2126-4e09-4d8a-896c-aada87fe86e8",
"Body" : "{\r\n \"name\": \"vnet642709b1e5\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/virtualNetworks/vnet642709b1e5\",\r\n \"etag\": \"W/\\\"43cc8409-12ac-41a8-ad43-da705634b896\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"westcentralus\",\r\n \"tags\": {},\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"resourceGuid\": \"3d95012a-7a3f-44ef-9a87-a34ae30213a4\",\r\n \"addressSpace\": {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/28\"\r\n ]\r\n },\r\n \"dhcpOptions\": {\r\n \"dnsServers\": []\r\n },\r\n \"subnets\": [\r\n {\r\n \"name\": \"subnet1\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/virtualNetworks/vnet642709b1e5/subnets/subnet1\",\r\n \"etag\": \"W/\\\"43cc8409-12ac-41a8-ad43-da705634b896\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"addressPrefix\": \"10.0.0.0/28\",\r\n \"delegations\": [],\r\n \"privateEndpointNetworkPolicies\": \"Enabled\",\r\n \"privateLinkServiceNetworkPolicies\": \"Enabled\"\r\n },\r\n \"type\": \"Microsoft.Network/virtualNetworks/subnets\"\r\n }\r\n ],\r\n \"virtualNetworkPeerings\": [],\r\n \"enableDdosProtection\": false\r\n }\r\n}",
"x-ms-client-request-id" : "5f01359c-1273-4ea1-8302-25c94414a2be",
Expand All @@ -262,7 +262,7 @@
"Exception" : null
}, {
"Method" : "GET",
"Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westcentralus/operations/429e2126-4e09-4d8a-896c-aada87fe86e8?api-version=2021-05-01",
"Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westcentralus/operations/429e2126-4e09-4d8a-896c-aada87fe86e8?api-version=2021-08-01",
"Headers" : {
"User-Agent" : "azsdk-java-com.azure.resourcemanager.network/2.16.0-beta.1 (17.0.1; Windows 11; 10.0)",
"x-ms-client-request-id" : "ce300142-120b-4d51-95bf-6fd0b4cfd20f"
Expand Down Expand Up @@ -290,7 +290,7 @@
"Exception" : null
}, {
"Method" : "GET",
"Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/virtualNetworks/vnet642709b1e5?api-version=2021-05-01",
"Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/virtualNetworks/vnet642709b1e5?api-version=2021-08-01",
"Headers" : {
"User-Agent" : "azsdk-java-com.azure.resourcemanager.network/2.16.0-beta.1 (17.0.1; Windows 11; 10.0)",
"x-ms-client-request-id" : "76b67e10-37d9-4d9a-8547-cc50c13c4fe4"
Expand Down Expand Up @@ -319,7 +319,7 @@
"Exception" : null
}, {
"Method" : "PUT",
"Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/publicIPAddresses/pip03580577?api-version=2021-05-01",
"Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/publicIPAddresses/pip03580577?api-version=2021-08-01",
"Headers" : {
"User-Agent" : "azsdk-java-com.azure.resourcemanager.network/2.16.0-beta.1 (17.0.1; Windows 11; 10.0)",
"x-ms-client-request-id" : "080dd820-1b22-44ad-b693-5a8f0f896b6e",
Expand All @@ -341,7 +341,7 @@
"Retry-After" : "0",
"x-ms-routing-request-id" : "SOUTHEASTASIA:20220608T034114Z:657cbc51-1c72-4a47-9505-00ebc70764c9",
"Expires" : "-1",
"Azure-AsyncOperation" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westcentralus/operations/8dd57a31-b702-4d13-80e9-cca5d8be49e1?api-version=2021-05-01",
"Azure-AsyncOperation" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westcentralus/operations/8dd57a31-b702-4d13-80e9-cca5d8be49e1?api-version=2021-08-01",
"x-ms-request-id" : "8dd57a31-b702-4d13-80e9-cca5d8be49e1",
"Body" : "{\r\n \"name\": \"pip03580577\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/publicIPAddresses/pip03580577\",\r\n \"etag\": \"W/\\\"8a90f8b1-82bf-4f95-a05c-ce28ad3e7cff\\\"\",\r\n \"location\": \"westcentralus\",\r\n \"tags\": {},\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"resourceGuid\": \"dcd8c63f-9089-46a0-845e-a534cb0594f5\",\r\n \"publicIPAddressVersion\": \"IPv4\",\r\n \"publicIPAllocationMethod\": \"Dynamic\",\r\n \"idleTimeoutInMinutes\": 4,\r\n \"dnsSettings\": {\r\n \"domainNameLabel\": \"pip7257688ce33\",\r\n \"fqdn\": \"pip7257688ce33.westcentralus.cloudapp.azure.com\"\r\n },\r\n \"ipTags\": []\r\n },\r\n \"type\": \"Microsoft.Network/publicIPAddresses\",\r\n \"sku\": {\r\n \"name\": \"Basic\",\r\n \"tier\": \"Regional\"\r\n }\r\n}",
"x-ms-client-request-id" : "080dd820-1b22-44ad-b693-5a8f0f896b6e",
Expand Down Expand Up @@ -379,7 +379,7 @@
"Exception" : null
}, {
"Method" : "GET",
"Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westcentralus/operations/8dd57a31-b702-4d13-80e9-cca5d8be49e1?api-version=2021-05-01",
"Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westcentralus/operations/8dd57a31-b702-4d13-80e9-cca5d8be49e1?api-version=2021-08-01",
"Headers" : {
"User-Agent" : "azsdk-java-com.azure.resourcemanager.network/2.16.0-beta.1 (17.0.1; Windows 11; 10.0)",
"x-ms-client-request-id" : "31508a49-758e-4d4e-a36f-504c78f079e6"
Expand Down Expand Up @@ -407,7 +407,7 @@
"Exception" : null
}, {
"Method" : "GET",
"Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/publicIPAddresses/pip03580577?api-version=2021-05-01",
"Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/publicIPAddresses/pip03580577?api-version=2021-08-01",
"Headers" : {
"User-Agent" : "azsdk-java-com.azure.resourcemanager.network/2.16.0-beta.1 (17.0.1; Windows 11; 10.0)",
"x-ms-client-request-id" : "41c4bd83-afc5-45a8-a1f5-8afee9b69935"
Expand Down Expand Up @@ -436,7 +436,7 @@
"Exception" : null
}, {
"Method" : "PUT",
"Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/networkInterfaces/nic36791e55bd9?api-version=2021-05-01",
"Uri" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/networkInterfaces/nic36791e55bd9?api-version=2021-08-01",
"Headers" : {
"User-Agent" : "azsdk-java-com.azure.resourcemanager.network/2.16.0-beta.1 (17.0.1; Windows 11; 10.0)",
"x-ms-client-request-id" : "5c5be144-69a3-42af-b7cb-d9ade480fc82",
Expand All @@ -461,7 +461,7 @@
"x-ms-request-id" : "bba51339-10ce-4741-bae9-919b3ee63092",
"Body" : "{\r\n \"name\": \"nic36791e55bd9\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/networkInterfaces/nic36791e55bd9\",\r\n \"etag\": \"W/\\\"d9a6872a-5430-4b2d-8d74-77b9426504fb\\\"\",\r\n \"location\": \"westcentralus\",\r\n \"tags\": {},\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"resourceGuid\": \"24c35b90-9512-4e36-91b7-a48a1816f367\",\r\n \"ipConfigurations\": [\r\n {\r\n \"name\": \"primary\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/networkInterfaces/nic36791e55bd9/ipConfigurations/primary\",\r\n \"etag\": \"W/\\\"d9a6872a-5430-4b2d-8d74-77b9426504fb\\\"\",\r\n \"type\": \"Microsoft.Network/networkInterfaces/ipConfigurations\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"privateIPAddress\": \"10.0.0.4\",\r\n \"privateIPAllocationMethod\": \"Dynamic\",\r\n \"publicIPAddress\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/publicIPAddresses/pip03580577\"\r\n },\r\n \"subnet\": {\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/javacsmrg01108/providers/Microsoft.Network/virtualNetworks/vnet642709b1e5/subnets/subnet1\"\r\n },\r\n \"primary\": true,\r\n \"privateIPAddressVersion\": \"IPv4\"\r\n }\r\n }\r\n ],\r\n \"dnsSettings\": {\r\n \"dnsServers\": [],\r\n \"appliedDnsServers\": [],\r\n \"internalDomainNameSuffix\": \"fiazkpj5plxujguhunfogaqtue.yx.internal.cloudapp.net\"\r\n },\r\n \"vnetEncryptionSupported\": false,\r\n \"enableIPForwarding\": false,\r\n \"hostedWorkloads\": [],\r\n \"tapConfigurations\": [],\r\n \"nicType\": \"Standard\"\r\n },\r\n \"type\": \"Microsoft.Network/networkInterfaces\"\r\n}",
"x-ms-client-request-id" : "5c5be144-69a3-42af-b7cb-d9ade480fc82",
"azure-asyncoperation" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westcentralus/operations/bba51339-10ce-4741-bae9-919b3ee63092?api-version=2021-05-01",
"azure-asyncoperation" : "http://localhost:1234/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westcentralus/operations/bba51339-10ce-4741-bae9-919b3ee63092?api-version=2021-08-01",
"Content-Type" : "application/json; charset=utf-8"
},
"Exception" : null
Expand Down
Loading