Update from master

AzureSDKAutomation · May 21, 2020 · 142e4f1 · 142e4f1
1 parent 0056ab8
commit 142e4f1
Show file tree

Hide file tree

Showing 17 changed files with 1,487 additions and 1,182 deletions.
diff --git a/sdk/peering/Microsoft.Azure.Management.Peering/AzSdk.RP.props b/sdk/peering/Microsoft.Azure.Management.Peering/AzSdk.RP.props
@@ -1,7 +1,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
   <PropertyGroup>
-    <AzureApiTag>Peering_2020-04-01;</AzureApiTag>
+    <AzureApiTag>Peering_2020-01-01-preview;</AzureApiTag>
     <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
   </PropertyGroup>
 </Project>
diff --git a/...ering/Microsoft.Azure.Management.Peering/src/Generated/SdkInfo_PeeringManagementClient.cs b/...ering/Microsoft.Azure.Management.Peering/src/Generated/SdkInfo_PeeringManagementClient.cs
diff --git a/sdk/peering/Microsoft.Azure.Management.Peering/src/Microsoft.Azure.Management.Peering.csproj b/sdk/peering/Microsoft.Azure.Management.Peering/src/Microsoft.Azure.Management.Peering.csproj
@@ -7,12 +7,10 @@
 		<PackageId>Microsoft.Azure.Management.Peering</PackageId>
 		<Description>Microsoft Azure Management Peering library</Description>
 		<AssemblyName>Microsoft.Azure.Management.Peering</AssemblyName>
-		<Version>2.1.0</Version>
+		<Version>2.0.1-preview</Version>
 		<PackageTags></PackageTags>
     <PackageReleaseNotes><![CDATA[
-- Add receivedRoutes functionality for peerings
-- Add Escalation contact role for peerAsns
-- Update error response model according to Resource Provider Contract
+- Made microsoft session address non-readonly
 ]]>
 </PackageReleaseNotes>
   </PropertyGroup>
@@ -23,4 +21,4 @@
 	<!-- Please do not move/edit code below this line -->
 	<Import Condition=" Exists('$([MSBuild]::GetPathOfFileAbove(AzSdk.RP.props))') " Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.RP.props'))" />
 	<!-- Please do not move/edit code above this line -->
-</Project>
+</Project>
diff --git a/sdk/peering/Microsoft.Azure.Management.Peering/src/Properties/AssemblyInfo.cs b/sdk/peering/Microsoft.Azure.Management.Peering/src/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyTitle("Microsoft Azure Peering Management Library")]
 [assembly: AssemblyDescription("Provides Microsoft Azure Peering management functions for managing the Microsoft Azure Peering service.")]
 
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.0.0.1")]
+[assembly: AssemblyFileVersion("2.0.0.1")]
 
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]

diff --git a/sdk/peering/Microsoft.Azure.Management.Peering/tests/PeeringTests.cs b/sdk/peering/Microsoft.Azure.Management.Peering/tests/PeeringTests.cs
@@ -78,7 +78,7 @@ public PeeringTests()
         /// <summary>
         /// The api version latest.
         /// </summary>
-        public const string ApiVersionLatest = "2020-04-01";
+        public const string ApiVersionLatest = "2020-01-01-preview";
 
         /// <summary>
         /// The peering operations test.
@@ -308,18 +308,9 @@ public void CreatePeeringService()
 
                 try
                 {
-                    var prefix = new PeeringServicePrefix
-                        {
-                            Prefix = "34.56.10.0/24",
-                            PeeringServicePrefixKey = TestUtilities.GenerateGuid().ToString()
-                        };
-
-                    var peeringServicePrefix = this.Client.Prefixes.CreateOrUpdate(
-                        rgname,
-                        name,
-                        prefixName,
-                        prefix.Prefix,
-                        prefix.PeeringServicePrefixKey);
+                    var prefix = new PeeringServicePrefix { Prefix = "10.10.10.0/24", PeeringServicePrefixKey = TestUtilities.GenerateGuid().ToString() };
+
+                    var peeringServicePrefix = this.Client.Prefixes.CreateOrUpdate(rgname, name, prefixName, prefix.Prefix, prefix.PeeringServicePrefixKey);
                     Assert.NotNull(peeringServicePrefix);
                     Assert.Equal(prefixName, peeringServicePrefix.Name);
 
@@ -328,11 +319,10 @@ public void CreatePeeringService()
                 }
                 catch (Exception ex)
                 {
-                    Assert.Contains("BadRequest", ex.Message);
+                    Assert.Contains("NotFound", ex.Message);
                 }
                 finally
                 {
-                    Assert.True(this.DeletePeeringService(name, rgname));
                 }
             }
         }
@@ -399,7 +389,7 @@ public void CreateGetListAndDeleteRegisteredPrefix()
                     var rgname = this.CreateResourceGroup().Name;
 
                     // Create Asn 
-                    var subId = this.CreatePeerAsn(asn, $"AS{asn}", isApproved: true, peerName: "FooBar");
+                    var subId = this.CreatePeerAsn(asn, $"AS{asn}", isApproved: true);
 
                     // Set prefix
                     var prefix = new PeeringRegisteredPrefix { Prefix = CreateIpv4Address(true) };
@@ -415,20 +405,21 @@ public void CreateGetListAndDeleteRegisteredPrefix()
 
                     // Create Direct Peering
                     var directConnection = new DirectConnection
+                    {
+                        ConnectionIdentifier = Guid.NewGuid().ToString(),
+                        BandwidthInMbps = 10000,
+                        PeeringDBFacilityId =
+                                                       loc.Direct.PeeringFacilities
+                                                           .FirstOrDefault(x => x.PeeringDBFacilityId == 99999)
+                                                           ?.PeeringDBFacilityId,
+                        SessionAddressProvider = SessionAddressProvider.Peer,
+                        BgpSession = new BgpSession
                         {
-                            ConnectionIdentifier = Guid.NewGuid().ToString(),
-                            BandwidthInMbps = 10000,
-                            PeeringDBFacilityId =
-                                loc.Direct.PeeringFacilities.FirstOrDefault(x => x.PeeringDBFacilityId == 99999)
-                                    ?.PeeringDBFacilityId,
-                            SessionAddressProvider = SessionAddressProvider.Peer,
-                            BgpSession = new BgpSession
-                                {
-                                    SessionPrefixV4 = prefix.Prefix, MaxPrefixesAdvertisedV4 = 20000
-                                },
-                            UseForPeeringService = true
-                        };
-
+                            SessionPrefixV4 = prefix.Prefix,
+                            MaxPrefixesAdvertisedV4 = 20000
+                        },
+                        UseForPeeringService = true
+                    };
                     directPeeringProperties.Connections.Add(directConnection);
                     var peeringModel = new PeeringModel
                     {
@@ -453,7 +444,6 @@ public void CreateGetListAndDeleteRegisteredPrefix()
                     var resourceGroupName = this.GetResourceGroup(peering?.Id);
                     var peeringName = this.GetPeeringName(peering?.Id);
                     var registeredPrefixName = $"{peering?.Name}{prefixName}";
-
                     var resource = this.Client.RegisteredPrefixes.CreateOrUpdate(
                         resourceGroupName,
                         peeringName,
@@ -480,6 +470,7 @@ public void CreateGetListAndDeleteRegisteredPrefix()
                     }
                     catch (Exception ex)
                     {
+
                         Assert.NotNull(ex.Message);
                     }
                 }
@@ -495,7 +486,7 @@ public void CreateGetListAndDeleteRegisteredPrefix()
         /// The create get list and delete registered ans.
         /// </summary>
         [Fact]
-        public void CreateGetListAndDeleteRegisteredAsns()
+        public void CreateGetListAndDeleteRegisteredAns()
         {
             using (MockContext context = MockContext.Start(this.GetType().FullName))
             {