Skip to content

switch to interger config + enable extension upgrade #2059

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

Merged
merged 2 commits into from
Apr 11, 2016
Merged

switch to interger config + enable extension upgrade #2059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc28946
switch to interger config + enable extension upgrade
MSSedusch Apr 5, 2016
aa8db58
update offline test results
MSSedusch Apr 6, 2016
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
2,738 changes: 1,240 additions & 1,498 deletions ....Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedLinux.json
View file
Open in desktop

Large diffs are not rendered by default.

2,896 changes: 1,699 additions & 1,197 deletions ...ommands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionAdvancedWindows.json
View file
Open in desktop

Large diffs are not rendered by default.

2,351 changes: 957 additions & 1,394 deletions ...ure.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionBasicLinux.json
View file
Open in desktop

Large diffs are not rendered by default.

2,668 changes: 1,505 additions & 1,163 deletions ...e.Commands.Compute.Test.ScenarioTests.AEMExtensionTests/TestAEMExtensionBasicWindows.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/ResourceManager/Compute/Commands.Compute/Extension/AEM/AEMExtensionConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static class AEMExtensionConstants
public static Dictionary<string, string> WADExtensionDefaultName = new Dictionary<string, string>() { { OSTypeWindows, "IaaSDiagnostics" }, { OSTypeLinux, "LinuxDiagnostic" } };
public static Dictionary<string, string> WADExtensionPublisher = new Dictionary<string, string>() { { OSTypeWindows, "Microsoft.Azure.Diagnostics" }, { OSTypeLinux, "Microsoft.OSTCExtensions" } };
public static Dictionary<string, string> WADExtensionType = new Dictionary<string, string>() { { OSTypeWindows, "IaaSDiagnostics" }, { OSTypeLinux, "LinuxDiagnostic" } };
public static Dictionary<string, Version> WADExtensionVersion = new Dictionary<string, Version>() { { OSTypeWindows, new Version(1,5) }, { OSTypeLinux, new Version(2,2) } };
public static Dictionary<string, Version> WADExtensionVersion = new Dictionary<string, Version>() { { OSTypeWindows, new Version(1,5) }, { OSTypeLinux, new Version(2,3) } };

public const string OSTypeWindows = "Windows";
public const string OSTypeLinux = "Linux";
Expand Down
164 changes: 107 additions & 57 deletions src/ResourceManager/Compute/Commands.Compute/Extension/AEM/AEMHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,75 +155,75 @@ internal AzureSLA GetVMSLA(VirtualMachine virtualMachine)
case "Standard_DS1":
case "Standard_DS1_v2":
result.HasSLA = true;
result.IOPS = "3200";
result.TP = "32";
result.IOPS = 3200;
result.TP = 32;
break;
case "Standard_DS2":
case "Standard_DS2_v2":
result.HasSLA = true;
result.IOPS = "6400";
result.TP = "64";
result.IOPS = 6400;
result.TP = 64;
break;
case "Standard_DS3":
case "Standard_DS3_v2":
result.HasSLA = true;
result.IOPS = "12800";
result.TP = "128";
result.IOPS = 12800;
result.TP = 128;
break;
case "Standard_DS4":
case "Standard_DS4_v2":
result.HasSLA = true;
result.IOPS = "25600";
result.TP = "256";
result.IOPS = 25600;
result.TP = 256;
break;
case "Standard_DS11":
case "Standard_DS11_v2":
result.HasSLA = true;
result.IOPS = "6400";
result.TP = "64";
result.IOPS = 6400;
result.TP = 64;
break;
case "Standard_DS12":
case "Standard_DS12_v2":
result.HasSLA = true;
result.IOPS = "12800";
result.TP = "128";
result.IOPS = 12800;
result.TP = 128;
break;
case "Standard_DS13":
case "Standard_DS13_v2":
result.HasSLA = true;
result.IOPS = "25600";
result.TP = "256";
result.IOPS = 25600;
result.TP = 256;
break;
case "Standard_DS14":
case "Standard_DS14_v2":
result.HasSLA = true;
result.IOPS = "50000";
result.TP = "512";
result.IOPS = 50000;
result.TP = 512;
break;
case "Standard_GS1":
result.HasSLA = true;
result.IOPS = "5000";
result.TP = "125";
result.IOPS = 5000;
result.TP = 125;
break;
case "Standard_GS2":
result.HasSLA = true;
result.IOPS = "10000";
result.TP = "250";
result.IOPS = 10000;
result.TP = 250;
break;
case "Standard_GS3":
result.HasSLA = true;
result.IOPS = "20000";
result.TP = "500";
result.IOPS = 20000;
result.TP = 500;
break;
case "Standard_GS4":
result.HasSLA = true;
result.IOPS = "40000";
result.TP = "1000";
result.IOPS = 40000;
result.TP = 1000;
break;
case "Standard_GS5":
result.HasSLA = true;
result.IOPS = "80000";
result.TP = "2000";
result.IOPS = 80000;
result.TP = 2000;
break;
default:
break;
Expand Down Expand Up @@ -305,20 +305,20 @@ internal AzureSLA GetDiskSLA(int? diskSize, string vhdUri)
if (diskSize > 0 && diskSize < 129)
{
// P10
sla.IOPS = "500";
sla.TP = "100";
sla.IOPS = 500;
sla.TP = 100;
}
else if (diskSize > 0 && diskSize < 513)
{
// P20
sla.IOPS = "2300";
sla.TP = "150";
sla.IOPS = 2300;
sla.TP = 150;
}
else if (diskSize > 0 && diskSize < 1025)
{
// P30
sla.IOPS = "5000";
sla.TP = "200";
sla.IOPS = 5000;
sla.TP = 200;
}
else
{
Expand Down Expand Up @@ -415,6 +415,20 @@ internal void WriteWarning(string message, params object[] args)
}
}

internal string GetDiskName(string diskPath)
{
Uri diskPathUri;
if (Uri.TryCreate(diskPath, UriKind.Absolute, out diskPathUri))
{
string fileName = diskPathUri.Segments[diskPathUri.Segments.Length - 1];
fileName = Uri.UnescapeDataString(fileName);

return fileName;
}

return "UKNOWN";
}

internal VirtualMachineExtension GetExtension(VirtualMachine vm, string type, string publisher)
{
if (vm.Resources != null)
Expand Down Expand Up @@ -454,7 +468,7 @@ internal Version GetExtensionVersion(VirtualMachine vm, VirtualMachineInstanceVi
{
string strExtVersion = extensionStatus.TypeHandlerVersion;
Version extVersion;
if (Version.TryParse(strExtVersion, out extVersion))
if (Version.TryParse(strExtVersion, out extVersion) && extVersion > version)
{
version = extVersion;
}
Expand All @@ -479,18 +493,32 @@ internal VirtualMachineExtensionInstanceView GetExtension(VirtualMachine vm, Vir
return vmStatus.Extensions.FirstOrDefault(extSt => extSt.Name.Equals(ext.Name));
}

internal void CheckMonProp(string CheckMessage, string PropertyName, JObject Properties, string ExpectedValue, AEMTestResult parentResult, bool checkExistance = false)
internal void MonitoringPropertyExists(string CheckMessage, string PropertyName, JObject Properties, AEMTestResult parentResult, bool expectedResult = true)
{
var value = GetMonPropertyValue(PropertyName, Properties);
WriteHost(CheckMessage + "...", false);
bool result = false;

if (!String.IsNullOrEmpty(value) && checkExistance)
WriteHost(CheckMessage + "...", false);
if (Properties != null && Properties["cfg"] != null)
{
parentResult.PartialResults.Add(new AEMTestResult(CheckMessage, true));
WriteHost("OK ", ConsoleColor.Green);
var set = Properties["cfg"].FirstOrDefault((tok) =>
{
JValue jval = (tok["key"] as JValue);
if (jval != null && jval.Value != null)
{
return jval.Value.Equals(PropertyName);
}

return false;
});

if (set != null && set["value"] != null && (set["value"] as JValue) != null)
{
result = true;

}
}

if ((!String.IsNullOrEmpty(value) && String.IsNullOrEmpty(ExpectedValue)) || (value == ExpectedValue))
if (result == expectedResult)
{
parentResult.PartialResults.Add(new AEMTestResult(CheckMessage, true));
WriteHost("OK ", ConsoleColor.Green);
Expand All @@ -502,42 +530,64 @@ internal void CheckMonProp(string CheckMessage, string PropertyName, JObject Pro
}
}

internal string GetMonPropertyValue(string PropertyName, JObject Properties)
internal void CheckMonitoringProperty<T>(string CheckMessage, string PropertyName, JObject Properties, T expectedValue, AEMTestResult parentResult)
{
if (Properties == null)
WriteHost(CheckMessage + "...", false);

T value;
if (GetMonPropertyValue<T>(PropertyName, Properties, out value))
{
return null;
if (value != null && value.Equals(expectedValue))
{
parentResult.PartialResults.Add(new AEMTestResult(CheckMessage, true));
WriteHost("OK ", ConsoleColor.Green);
}
else
{
parentResult.PartialResults.Add(new AEMTestResult(CheckMessage, false));
WriteHost("NOT OK ", ConsoleColor.Red);
}
}
if (Properties["cfg"] == null)
else
{
return null;
parentResult.PartialResults.Add(new AEMTestResult(CheckMessage, false));
WriteHost("NOT OK ", ConsoleColor.Red);
}
}

internal bool GetMonPropertyValue<T>(string PropertyName, JObject Properties, out T result)
{
result = default(T);

if (Properties == null || Properties["cfg"] == null)
{
return false;
}

var set = Properties["cfg"].FirstOrDefault((tok) =>
{
JValue jval = (tok["key"] as JValue);
if (jval != null && jval.Value != null)
JValue jvaltok = (tok["key"] as JValue);
if (jvaltok != null && jvaltok.Value != null)
{
return jval.Value.Equals(PropertyName);
return jvaltok.Value.Equals(PropertyName);
}

return false;
});
if (set == null)
{
return null;
}
if (set["value"] == null)

if (set == null || set["value"] == null)
{
return null;
return false;
}

if ((set["value"] as JValue) != null)
JValue jval = (set["value"] as JValue);
if (jval != null && jval.Value != null)
{
return (set["value"] as JValue).Value as string;
result = (set["value"] as JValue).Value<T>();
return true;
}
return null;

return false;
}

internal bool CheckWADConfiguration(System.Xml.XmlDocument CurrentConfig)
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Compute/Commands.Compute/Extension/AEM/AzureSLA.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Microsoft.Azure.Commands.Compute
public class AzureSLA
{
public bool HasSLA { get; internal set; }
public string IOPS { get; internal set; }
public string TP { get; internal set; }
public int IOPS { get; internal set; }
public int TP { get; internal set; }
}
}
4 changes: 2 additions & 2 deletions src/ResourceManager/Compute/Commands.Compute/Extension/AEM/KeyValuePair.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ public class KeyValuePair
public string Key { get; set; }

[JsonProperty("value")]
public string Value { get; set; }
public object Value { get; set; }

public KeyValuePair() { }

public KeyValuePair(string key, string value)
public KeyValuePair(string key, object value)
{
this.Key = key;
this.Value = value;
Expand Down
Loading