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.

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

LTR Policy Changes #94

Open
wants to merge 99 commits into
base: dev1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
bd15375
Policy Bug Fixes
pragrawa Jul 3, 2015
040eff9
Merge Conflict
pragrawa Jul 3, 2015
4a0afc2
Merge pull request #65 from MabOneSdk/pragrawa
pragrawa Jul 3, 2015
5c203b7
[3435722]: Unregister-AzureBackupContainer has a filter named "AzureB…
mkherani Jul 6, 2015
305f858
Merge from dev
Jul 7, 2015
13463f3
Adding other cmdlets part 1
Jul 7, 2015
5b2b85a
Adding other cmdlets part 2
Jul 7, 2015
3c2c409
Adding other cmdlets part 3
Jul 7, 2015
1411f87
Updating the hydra dll to latest
Jul 8, 2015
ffc31bd
Removed ContainerInfo and depending only on CSMContainerResponse
Jul 8, 2015
2c72b63
CSM related changes for Reg\unreg cmdlet-part1 (build wont work)
mkherani Jul 8, 2015
29d2007
CSM changes for Reg\unreg cmdlet
mkherani Jul 9, 2015
41e7538
Fixing merge confilcs,
mkherani Jul 9, 2015
2291026
FI from csp-artemis
Jul 13, 2015
3842962
backupRestorechanges
panbha Jul 15, 2015
fbaeb57
backupandrestorepart2
panbha Jul 15, 2015
f4676aa
Merge pull request #67 from MabOneSdk/csm-panbha1
panbha Jul 15, 2015
9af2f3a
backupandrestorepowerhsell
panbha Jul 16, 2015
7692b1f
commnetingcode
panbha Jul 16, 2015
195cdc0
Merge pull request #68 from MabOneSdk/csm-panbha1
panbha Jul 16, 2015
ed281a0
backup
panbha Jul 16, 2015
f54c81b
Merge pull request #69 from MabOneSdk/csm-panbha1
panbha Jul 16, 2015
99e6ae2
recoverypoint5
panbha Jul 18, 2015
f9ae9e9
Merge pull request #70 from MabOneSdk/csm-panbha1
panbha Jul 18, 2015
22df790
Adding End To End Test case.
swatimadhukargit Jul 20, 2015
d82f874
Merge branch 'csm-master' of https://github.com/MabOneSdk/azure-power…
swatimadhukargit Jul 20, 2015
53f1a9f
Renaming ScenarioTest class name
swatimadhukargit Jul 21, 2015
a61bdc1
pikumarandmychanges
panbha Jul 21, 2015
62bafb1
Merge pull request #72 from MabOneSdk/csm-panbhacr
panbha Jul 21, 2015
1709190
csm changes for azure backup item
pikumarmsft16 Jul 22, 2015
67bbdf8
merge
pikumarmsft16 Jul 22, 2015
d3ef6cf
recoverypointId
panbha Jul 22, 2015
c469f58
Merge pull request #73 from MabOneSdk/csm-panbhacr
panbha Jul 22, 2015
86540c6
csm changes
pikumarmsft16 Jul 22, 2015
2d41fb1
merge
pikumarmsft16 Jul 22, 2015
aaa44ec
Temporary commit of csm changes
AditTulasi Jul 22, 2015
1c21c1b
Merge pull request #74 from MabOneSdk/csm-pikumar
pikumarmsft16 Jul 22, 2015
9a3ffcf
CSM changes for jobs commit 2
AditTulasi Jul 22, 2015
53060d1
CSM Jobs changes commit 3
AditTulasi Jul 22, 2015
f354a88
correctinglostcheckin
panbha Jul 22, 2015
73b9632
Merge pull request #75 from MabOneSdk/csm-panbhacr21
panbha Jul 22, 2015
92ff966
backup
panbha Jul 22, 2015
33868fc
recovery
panbha Jul 22, 2015
6eea9df
restore
panbha Jul 22, 2015
cbef846
dll
panbha Jul 22, 2015
7118604
Merge pull request #76 from MabOneSdk/csm-panbhacr21
panbha Jul 22, 2015
4b9a024
Jobs CSM changes
AditTulasi Jul 23, 2015
c6945a6
change in filter
pikumarmsft16 Jul 23, 2015
dac6a15
merge
pikumarmsft16 Jul 23, 2015
49a4d88
Merge pull request #77 from MabOneSdk/csm-pikumar
pikumarmsft16 Jul 23, 2015
b6f8ed5
Temporary commit before pushing
AditTulasi Jul 23, 2015
670006a
Merge branch 'csm-master' of https://github.com/MabOneSdk/azure-power…
AditTulasi Jul 23, 2015
48c8740
Merge branch 'csm-master' into csm-adit-branch
AditTulasi Jul 23, 2015
87f5655
Merge pull request #78 from MabOneSdk/csm-adit-branch
AditTulasi Jul 23, 2015
46ff800
Undoing an unintended change
AditTulasi Jul 23, 2015
a09d0e5
Deleting unnecessary files added in the previous commit.
Jul 23, 2015
1a94220
small fix
pikumarmsft16 Jul 24, 2015
e114b22
Merge branch 'csm-master' into csm-pikumar
pikumarmsft16 Jul 24, 2015
e0e473e
RI from release
Jul 24, 2015
0cdd30e
Uncommenting some commented lines
AditTulasi Jul 24, 2015
f5a351e
Merge branch 'csm-master' of https://github.com/MabOneSdk/azure-power…
AditTulasi Jul 24, 2015
34a7eac
backuprecoveryrestore
panbha Jul 24, 2015
413ccda
restore
panbha Jul 24, 2015
89a128c
Merge pull request #79 from MabOneSdk/csm-panbhacr21
panbha Jul 24, 2015
b19cb82
Merge branch 'csm-master' of https://github.com/MabOneSdk/azure-power…
Jul 24, 2015
4edecaa
backandrestore
panbha Jul 24, 2015
b1edcc0
backandrestore1
panbha Jul 24, 2015
cff0bb9
Merge pull request #80 from MabOneSdk/csm-panbhacr21
panbha Jul 24, 2015
fa10bb9
LTR Policy
pragrawa Jul 25, 2015
a5af176
LTR Policy Powershell Tests
pragrawa Jul 25, 2015
4f12154
LTR Policy changes
pragrawa Jul 25, 2015
74f37a9
format
panbha Jul 26, 2015
4610d1e
Merge pull request #82 from MabOneSdk/csm-panbhacr21
panbha Jul 26, 2015
8d0ffda
format
panbha Jul 26, 2015
e2b3fc4
Merge pull request #85 from MabOneSdk/csm-panbhacr21
panbha Jul 26, 2015
771b839
recoverypointId
panbha Jul 27, 2015
bb18d17
recoverypointId
panbha Jul 27, 2015
e6e4335
recoverypointId1
panbha Jul 27, 2015
7d9bf86
recoverypointId3
panbha Jul 27, 2015
87306f5
Merge pull request #86 from MabOneSdk/csm-panbhacr21
panbha Jul 27, 2015
11d58e7
Merge Conflict
pragrawa Jul 27, 2015
2f1c45f
Merge pull request #88 from MabOneSdk/csm-pragrawa
pragrawa Jul 27, 2015
03c4dce
adding update protection
pikumarmsft16 Jul 27, 2015
1a6321c
Merge branch 'csm-master' into csm-pikumar
pikumarmsft16 Jul 27, 2015
662a06d
LTR Policy changes
pragrawa Jul 27, 2015
3d0057f
LTR Policy changes
pragrawa Jul 27, 2015
88fbb2e
Merge pull request #89 from MabOneSdk/csm-pragrawa
pragrawa Jul 27, 2015
356464b
Merge branch 'csm-master' into csm-pikumar
pikumarmsft16 Jul 28, 2015
76bc381
minor fix in Enable-AzureBackupProtection
pikumarmsft16 Jul 28, 2015
0250d89
Merge pull request #90 from MabOneSdk/csm-pikumar
pikumarmsft16 Jul 28, 2015
b712e42
checking for null response
pikumarmsft16 Jul 28, 2015
8819fd3
Merge pull request #91 from MabOneSdk/csm-pikumar
pikumarmsft16 Jul 28, 2015
a3bd7e9
checking if ds is not havning any policy associated.
pikumarmsft16 Jul 29, 2015
0a6792a
minor fix
pikumarmsft16 Jul 29, 2015
4f4f946
Merge branch 'csm-master' into csm-pikumar
pikumarmsft16 Jul 29, 2015
1edb83b
minor fix in filter
pikumarmsft16 Jul 29, 2015
43168f2
Merge pull request #92 from MabOneSdk/csm-pikumar
pikumarmsft16 Jul 29, 2015
bbaee32
resolving merge conflicts + fixing build break in azure backup project
Jul 31, 2015
afefa93
LTR Policy changes
pragrawa Aug 3, 2015
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
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@

using System;
using System.Collections.Generic;
using System.Management.Automation.Language;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Microsoft.Azure.Commands.Compute.Extension.DSC
namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
{
public class ConfigurationParseResult
public class Constants
{
public string Path { get; set; }
public ParseError[] Errors { get; set; }
public List<String> RequiredModules { get; set; }

public const int VaultCertificateExpiryInHoursForBackup = 48;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,30 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

namespace Microsoft.Azure.Commands.Compute.Extension.DSC
{

using System.Collections;
using Microsoft.Azure.Management.BackupServices.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

/// <summary>
/// Represents private/protected settings. Serialized representation of this object stored as an encrypted string on the VM.
/// Part of the protocol between Set-AzureVMDscExtension cmdlet and DSC Extension handler.
/// </summary>
public class DscExtensionPrivateSettings
namespace Microsoft.Azure.Commands.AzureBackup.Models
{
internal class ListContainerQueryParameter : ManagementBaseObject
{
/// <summary>
/// Url to the blob storage with ConfigurationData .psd1 file.
///Containers information for registration
/// </summary>
public string ContainerTypeField { get; set; }

/// <summary>
///Containers status information
/// </summary>
public string DataBlobUri { get; set; }
public string ContainerStatusField { get; set; }

/// <summary>
/// This hashtable contains parameters that needs to be encrypted on target VM, like PSCredential.
/// <see cref="DscExtensionPublicSettings.Properties" /> are not encrypted on target VM.
///Containers status information
/// </summary>
public Hashtable Items { get; set; }
public string ContainerFriendlyNameField { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,14 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using System.Collections;
using Microsoft.Azure.Commands.Compute.Models;
using System.Net;

namespace Microsoft.Azure.Commands.Compute.Extension.DSC
namespace Microsoft.Azure.Commands.Compute.Models
{
public class VirtualMachineDscExtensionContext : PSVirtualMachineExtension
public class PSOperationContext
{
public string RequestId { get; set; }

public string ModulesUrl { get; set; }
public string ConfigurationFunction { get; set; }
public Hashtable Properties { get; set; }

public HttpStatusCode StatusCode { get; set; }
}
}
13 changes: 0 additions & 13 deletions src/AzurePowershell.sln
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates.Test", "ResourceManager\Commerce\Commands.UsageAggregates.Test\Commands.UsageAggregates.Test.csproj", "{F220C306-29A3-4511-8518-A58A55C60D07}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement.ServiceManagement", "ResourceManager\ApiManagement\Commands.ApiManagement.ServiceManagement\Commands.ApiManagement.ServiceManagement.csproj", "{ED8BA708-AF42-4C08-9F4E-DAA1037797D5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement.ServiceManagement.Test", "ResourceManager\ApiManagement\Commands.SMAPI.Test\Commands.ApiManagement.ServiceManagement.Test.csproj", "{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AzureBackup", "ResourceManager\AzureBackup\Commands.AzureBackup\Commands.AzureBackup.csproj", "{6C8D2337-C9D1-4F52-94B3-AB63A19F3453}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AzureBackup.Test", "ResourceManager\AzureBackup\Commands.AzureBackup.Test\Commands.AzureBackup.Test.csproj", "{678AE95D-2364-47D7-888C-3FFA6D412CC8}"
Expand Down Expand Up @@ -556,14 +552,6 @@ Global
{F220C306-29A3-4511-8518-A58A55C60D07}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F220C306-29A3-4511-8518-A58A55C60D07}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F220C306-29A3-4511-8518-A58A55C60D07}.Release|Any CPU.Build.0 = Release|Any CPU
{ED8BA708-AF42-4C08-9F4E-DAA1037797D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ED8BA708-AF42-4C08-9F4E-DAA1037797D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ED8BA708-AF42-4C08-9F4E-DAA1037797D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ED8BA708-AF42-4C08-9F4E-DAA1037797D5}.Release|Any CPU.Build.0 = Release|Any CPU
{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}.Release|Any CPU.Build.0 = Release|Any CPU
{6C8D2337-C9D1-4F52-94B3-AB63A19F3453}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C8D2337-C9D1-4F52-94B3-AB63A19F3453}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C8D2337-C9D1-4F52-94B3-AB63A19F3453}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -616,7 +604,6 @@ Global
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{F220C306-29A3-4511-8518-A58A55C60D07} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{678AE95D-2364-47D7-888C-3FFA6D412CC8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</Reference>
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.27-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.26-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
11 changes: 11 additions & 0 deletions src/Common/Commands.Common.Storage/app.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
2 changes: 1 addition & 1 deletion src/Common/Commands.Common.Storage/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.0.27-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.0.26-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</Reference>
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.27-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.26-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.NetFramework">
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
Expand Down
27 changes: 11 additions & 16 deletions src/Common/Commands.Common.Test/Common/MockSubsciptionFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
using System.Threading.Tasks;
using Microsoft.Azure.Common.Authentication;
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
using System.Net.Http;
using System.Net.Http.Headers;

namespace Microsoft.WindowsAzure.Commands.Common.Test.Common
{
Expand Down Expand Up @@ -51,12 +49,12 @@ public TClient CreateCustomClient<TClient>(params object[] parameters) where TCl
throw new NotImplementedException();
}

public HttpClient CreateHttpClient(string endpoint, HttpMessageHandler effectiveHandler)
public System.Net.Http.HttpClient CreateHttpClient(string endpoint, System.Net.Http.HttpMessageHandler effectiveHandler)
{
throw new NotImplementedException();
}

public HttpClient CreateHttpClient(string endpoint, System.Net.ICredentials credentials)
public System.Net.Http.HttpClient CreateHttpClient(string endpoint, System.Net.ICredentials credentials)
{
throw new NotImplementedException();
}
Expand All @@ -66,19 +64,16 @@ public void RemoveAction(Type actionType)
throw new NotImplementedException();
}

public void AddUserAgent(string productName, string productVersion)
public List<System.Net.Http.Headers.ProductInfoHeaderValue> UserAgents
{
throw new NotImplementedException();
}

public void AddUserAgent(string productName)
{
throw new NotImplementedException();
}

public HashSet<ProductInfoHeaderValue> UserAgents
{
get { throw new NotImplementedException(); }
get
{
throw new NotImplementedException();
}
set
{
throw new NotImplementedException();
}
}
}
}
2 changes: 1 addition & 1 deletion src/Common/Commands.Common.Test/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.0.27-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.0.26-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5562.19686-prerelease" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Commands.Common/Commands.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</Reference>
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.27-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.26-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.NetFramework">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Commands.Common/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.0.27-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.0.26-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Commands.Profile/Commands.Profile.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</Reference>
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.27-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.26-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.NetFramework">
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Commands.Profile/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.0.27-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.0.26-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</Reference>
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.27-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.26-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.NetFramework">
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
Expand Down Expand Up @@ -105,10 +105,6 @@
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.2.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -209,9 +205,6 @@
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunServiceManagementCloudExceptionTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunStartAndStopMultipleVirtualMachinesTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\TestGetAzureLocation.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,17 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using Microsoft.Azure.Common.Authentication;
using Microsoft.Azure.Test;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Xunit;

namespace Microsoft.WindowsAzure.Commands.ScenarioTest
{
public partial class ServiceManagementTests
{
[Fact]
[Trait(Category.Service, Category.ServiceManagement)]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.AcceptanceType, Category.BVT)]
public void TestGetAzureVM()
{
this.RunPowerShellTest("Test-GetAzureVM");
}

[Fact]
[Trait(Category.Service, Category.ServiceManagement)]
[Trait(Category.AcceptanceType, Category.CheckIn)]
Expand All @@ -44,14 +40,5 @@ public void RunServiceManagementCloudExceptionTests()
{
this.RunPowerShellTest("Run-ServiceManagementCloudExceptionTests");
}

[Fact]
[Trait(Category.Service, Category.ServiceManagement)]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.AcceptanceType, Category.BVT)]
public void RunStartAndStopMultipleVirtualMachinesTest()
{
this.RunPowerShellTest("Run-StartAndStopMultipleVirtualMachinesTest");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,27 @@

using Microsoft.Azure.Common.Authentication;
using Microsoft.Azure.Test;
using Microsoft.WindowsAzure.Management;
using Microsoft.WindowsAzure.Management.Compute;
using Microsoft.WindowsAzure.Management.Network;
using Microsoft.WindowsAzure.Management.Storage;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Xunit;

namespace Microsoft.WindowsAzure.Commands.ScenarioTest
{
public partial class ServiceManagementTests
{
private EnvironmentSetupHelper helper = new EnvironmentSetupHelper();

protected void SetupManagementClients()
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestGetAzureVM()
{
var rdfeTestFactory = new RDFETestEnvironmentFactory();
var managementClient = TestBase.GetServiceClient<ManagementClient>(rdfeTestFactory);
var computeClient = TestBase.GetServiceClient<ComputeManagementClient>(rdfeTestFactory);
var networkClient = TestBase.GetServiceClient<NetworkManagementClient>(rdfeTestFactory);
var storageClient = TestBase.GetServiceClient<StorageManagementClient>(rdfeTestFactory);
this.RunPowerShellTest("Test-GetAzureVM");
}

helper.SetupSomeOfManagementClients(
managementClient,
computeClient,
networkClient,
storageClient);
protected void SetupManagementClients()
{
helper.SetupSomeOfManagementClients();
}

protected void RunPowerShellTest(params string[] scripts)
Expand Down
Loading