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

Merge Network changes into AutoRest #2999

Merged
merged 39 commits into from
Mar 28, 2017
Merged

Merge Network changes into AutoRest #2999

merged 39 commits into from
Mar 28, 2017

Conversation

cormacpayne
Copy link
Member

@cormacpayne cormacpayne commented Mar 28, 2017 •
edited
Loading

Description

Merging changes for Network version 10.0.0-preview back into the AutoRest branch.

@jobatzil @Nilambari @henry416 please take a look

This checklist is used to make sure that common guidelines for a pull request are followed.

General Guidelines

  • Title of the pull request is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

  • Pull request includes test coverage for the included changes.

SDK Generation Guidelines

  • If an SDK is being regenerated based on a new swagger spec, a link to the pull request containing these swagger spec changes has been included above.
  • The generate.cmd file for the SDK has been updated with the version of AutoRest, as well as a link to the swagger spec, used to generate the code.
  • The project.json and AssemblyInfo.cs files have been updated with the new version of the SDK.

henry416 and others added 30 commits March 16, 2017 10:59
@henry416
Virtual Network Gateway Connection tests for Ipsec Policy
dd1bf69 
Added virtual network gateway connection tests for ipsec policies

Added VirtualNetworkGatewayConnection Ipsec Policies Test record

Test Cases updated to use field names

Connection Ipsec Policies Test session data

Ipsec policies Test added for virtual network gateway connections
@henry416
Generated code for network new 2017-03-01 api-version (only Ipsec Pol…
af97a84 
…icies added compared to previous swagger)
@henry416
package version incremented
3e92d91
@jobatzil
#WAF added autogenerated files
d8f24c6
@jobatzil
#WAF changed version in rest API calls of Network/SessionRecords.
4d7bbbc
@jobatzil
#WAF changed version in rest API calls of Compute/SessionRecords.
678613c
@henry416
Merge remote-tracking branch 'upstream/AutoRest' into AutoRest
c95c199
@jobatzil
#WAF set x-ms-flatten to true for ApplicationGatewayFirewallRuleSet.
c8288be
@henry416
Using proper rest api spec for 2017-03-01 generation
a245f83
@jobatzil
#WAF Added web application firewall related tests and rerecorded agw …
8aeba43 
…tests.
@jobatzil
#WAF removed unneccessary file ending changes created by the PS scrip…
86b2b89 
…t for updating the api version number in SessionRecords.
@jobatzil
#WAF updated comment for ApplicationGatewayFirewallDisabledRuleGroup.…
ae21523 
…rules.
@jobatzil
#WAF incremented assembly version.
91ea4b3
@henry416
Update Network test versions to 2017-03-01
86f6cd3
@henry416
corrected Assembly version for 2017-03-01
9cac289
@jobatzil
#WAF removed redundancy in description of enums.
35f83bd
@jobatzil
#WAF updated required fields for getBackendHealth Api result.
354816e
@jobatzil
#INIT updated the api-version to 2016-03-01 in the Network *Operation…
dce29a7 
….cs files.
@jobatzil
#INIT Updated Version number to 10.0.0 (next major version) since the…
f916094 
…re will be breaking changes for application gateway.
@jobatzil
#INIT Changed version number to 2017-03-01 in Network/SessionRecordings.
b0ec565
@jobatzil
#INIT Changed version number to 2017-03-01 in Compute/SessionRecordings.
d6151b3
@jobatzil
#INIT Removed unneccessary changes where only end of file chagned.
34fd7c6
@henry416
Merge remote-tracking branch 'upstream/network-changes' into AutoRest
ccbc38e
@henry416
AssemblyInfo revert AssemblyVersion to original as requested
05e52a9
@jobatzil
#WAF Renamed GetAvailableWafRuleSets to ListAvailableWafRuleSets.
4d44fec
@cormacpayne
Merge pull request #2958 from jobatzil/feature/jobatzil/waf
89cd77f 
#WAF Added the changes of web application firewall for application gateway
@henry416
merge with network-changes branch
8af95e9
@henry416
removed EOF-only changes
2108694
@jobatzil
Merge remote-tracking branch 'upstream/network-changes' into feature/…
3704f56 
…jobatzil/waf
@jobatzil
Merge remote-tracking branch 'upstream/network-changes' into feature/…
a007d57 
…jobatzil/plain201703
cormacpayne and others added 9 commits March 23, 2017 09:35
@cormacpayne
Merge pull request #2943 from henry416/AutoRest
97c5852 
Ipsec Policies for Virtual Network Gateway Connection
@jobatzil
Merge remote-tracking branch 'upstream/network-changes' into feature/…
d9b1aa8 
…jobatzil/plain201703
@cormacpayne
Merge pull request #2976 from jobatzil/feature/jobatzil/plain201703
ed4e0c0 
#INIT to 2017-03-01
@Nilambari
#12345: Updating generated files after fixing virtualNetworkGateway r…
0baef6d 
…esource swagger to remove unnecessary required params.
@jobatzil
#WAF improved tests.
d51092b
@jobatzil
Merge branch 'feature/jobatzil/plain201703' into feature/jobatzil/waf
35bdd3f
@jobatzil
#WAF Recorded new ApplicationGateway tests.
10b0785
@cormacpayne
Merge pull request #2986 from Nilambari/network-changes
502ca16 
Updating generated files after fixing virtualNetworkGateway resource swagger to remove unnecessary required params.
@cormacpayne
Merge pull request #2992 from jobatzil/feature/jobatzil/waf2
62bced7 
#WAF Renamed getAvailableWafRuleSets to listAvailableWafRuleSets and enhanced tests.
henry416
henry416 approved these changes Mar 28, 2017
View reviewed changes
Copy link
Member

@henry416 henry416 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IPsec policy work is intact

@Nilambari Nilambari self-assigned this Mar 28, 2017
@Nilambari Nilambari self-requested a review March 28, 2017 23:07
@Nilambari Nilambari removed their assignment Mar 28, 2017
Nilambari
Nilambari approved these changes Mar 28, 2017
View reviewed changes
Copy link
Member

@Nilambari Nilambari left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Signing off for merge of PR:- #2986

@shahabhijeet
Copy link
Member

@cormacpayne LGTM. Merge whenever you are ready.

@cormacpayne cormacpayne merged commit 48760c2 into AutoRest Mar 28, 2017
@shahabhijeet shahabhijeet deleted the network-changes branch July 19, 2018 01:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@henry416 henry416 henry416 approved these changes

@Nilambari Nilambari Nilambari approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@cormacpayne @shahabhijeet @henry416 @Nilambari @msftclas @jobatzil