Skip to content

Fix auto-generator and update generated codes. #60

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 1 commit into from
Nov 18, 2015
Merged

Fix auto-generator and update generated codes. #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ...iceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1441,6 +1441,7 @@ function Write-OperationCmdletFile

if ($only_strings)
{
$create_local_param_definition = "";
# Case 1: the parameter type contains only string types.
foreach ($param in $does_contain_only_strings)
{
Expand Down
5 changes: 5 additions & 0 deletions ...ement/Compute/Commands.ServiceManagement.Preview/Generated/ComputeAutomationBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ protected static PSArgument[] ConvertFromObjectsToArguments(string[] names, obje

protected static object[] ConvertFromArgumentsToObjects(object[] arguments)
{
if (arguments == null)
{
return null;
}

var objects = new object[arguments.Length];

for (int index = 0; index < arguments.Length; index++)
Expand Down
45 changes: 32 additions & 13 deletions ...ute/Commands.ServiceManagement.Preview/Generated/DNSServer/DNSServerAddDNSServerMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected object CreateDNSServerAddDNSServerDynamicParameters()
dynamicParameters = new RuntimeDefinedParameterDictionary();
var pServiceName = new RuntimeDefinedParameter();
pServiceName.Name = "ServiceName";
pServiceName.ParameterType = typeof(System.String);
pServiceName.ParameterType = typeof(string);
pServiceName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Expand All @@ -49,7 +49,7 @@ protected object CreateDNSServerAddDNSServerDynamicParameters()

var pDeploymentName = new RuntimeDefinedParameter();
pDeploymentName.Name = "DeploymentName";
pDeploymentName.ParameterType = typeof(System.String);
pDeploymentName.ParameterType = typeof(string);
pDeploymentName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Expand All @@ -59,25 +59,37 @@ protected object CreateDNSServerAddDNSServerDynamicParameters()
pDeploymentName.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("DeploymentName", pDeploymentName);

var pParameters = new RuntimeDefinedParameter();
pParameters.Name = "DNSServerAddDNSServerParameters";
pParameters.ParameterType = typeof(Microsoft.WindowsAzure.Management.Compute.Models.DNSAddParameters);
pParameters.Attributes.Add(new ParameterAttribute
var pAddress = new RuntimeDefinedParameter();
pAddress.Name = "Address";
pAddress.ParameterType = typeof(string);
pAddress.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Position = 3,
Mandatory = true
Mandatory = false
});
pParameters.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("DNSServerAddDNSServerParameters", pParameters);
pAddress.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("Address", pAddress);

var pName = new RuntimeDefinedParameter();
pName.Name = "Name";
pName.ParameterType = typeof(string);
pName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Position = 4,
Mandatory = false
});
pName.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("Name", pName);

var pArgumentList = new RuntimeDefinedParameter();
pArgumentList.Name = "ArgumentList";
pArgumentList.ParameterType = typeof(object[]);
pArgumentList.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByStaticParameters",
Position = 4,
Position = 5,
Mandatory = true
});
pArgumentList.Attributes.Add(new AllowNullAttribute());
Expand All @@ -90,7 +102,11 @@ protected void ExecuteDNSServerAddDNSServerMethod(object[] invokeMethodInputPara
{
string serviceName = (string)ParseParameter(invokeMethodInputParameters[0]);
string deploymentName = (string)ParseParameter(invokeMethodInputParameters[1]);
DNSAddParameters parameters = (DNSAddParameters)ParseParameter(invokeMethodInputParameters[2]);
var parameters = new DNSAddParameters();
var pAddress = (string) ParseParameter(invokeMethodInputParameters[2]);
parameters.Address = string.IsNullOrEmpty(pAddress) ? null : pAddress;
var pName = (string) ParseParameter(invokeMethodInputParameters[3]);
parameters.Name = string.IsNullOrEmpty(pName) ? null : pName;

var result = DNSServerClient.AddDNSServer(serviceName, deploymentName, parameters);
WriteObject(result);
Expand All @@ -103,9 +119,12 @@ protected PSArgument[] CreateDNSServerAddDNSServerParameters()
{
string serviceName = string.Empty;
string deploymentName = string.Empty;
DNSAddParameters parameters = new DNSAddParameters();
var pAddress = string.Empty;
var pName = string.Empty;

return ConvertFromObjectsToArguments(new string[] { "ServiceName", "DeploymentName", "Parameters" }, new object[] { serviceName, deploymentName, parameters });
return ConvertFromObjectsToArguments(
new string[] { "ServiceName", "DeploymentName", "Address", "Name" },
new object[] { serviceName, deploymentName, pAddress, pName });
}
}
}
10 changes: 6 additions & 4 deletions .../Commands.ServiceManagement.Preview/Generated/DNSServer/DNSServerDeleteDNSServerMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected object CreateDNSServerDeleteDNSServerDynamicParameters()
dynamicParameters = new RuntimeDefinedParameterDictionary();
var pServiceName = new RuntimeDefinedParameter();
pServiceName.Name = "ServiceName";
pServiceName.ParameterType = typeof(System.String);
pServiceName.ParameterType = typeof(string);
pServiceName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Expand All @@ -49,7 +49,7 @@ protected object CreateDNSServerDeleteDNSServerDynamicParameters()

var pDeploymentName = new RuntimeDefinedParameter();
pDeploymentName.Name = "DeploymentName";
pDeploymentName.ParameterType = typeof(System.String);
pDeploymentName.ParameterType = typeof(string);
pDeploymentName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Expand All @@ -61,7 +61,7 @@ protected object CreateDNSServerDeleteDNSServerDynamicParameters()

var pDnsServerName = new RuntimeDefinedParameter();
pDnsServerName.Name = "DnsServerName";
pDnsServerName.ParameterType = typeof(System.String);
pDnsServerName.ParameterType = typeof(string);
pDnsServerName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Expand Down Expand Up @@ -105,7 +105,9 @@ protected PSArgument[] CreateDNSServerDeleteDNSServerParameters()
string deploymentName = string.Empty;
string dnsServerName = string.Empty;

return ConvertFromObjectsToArguments(new string[] { "ServiceName", "DeploymentName", "DnsServerName" }, new object[] { serviceName, deploymentName, dnsServerName });
return ConvertFromObjectsToArguments(
new string[] { "ServiceName", "DeploymentName", "DnsServerName" },
new object[] { serviceName, deploymentName, dnsServerName });
}
}
}
47 changes: 33 additions & 14 deletions .../Commands.ServiceManagement.Preview/Generated/DNSServer/DNSServerUpdateDNSServerMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected object CreateDNSServerUpdateDNSServerDynamicParameters()
dynamicParameters = new RuntimeDefinedParameterDictionary();
var pServiceName = new RuntimeDefinedParameter();
pServiceName.Name = "ServiceName";
pServiceName.ParameterType = typeof(System.String);
pServiceName.ParameterType = typeof(string);
pServiceName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Expand All @@ -49,7 +49,7 @@ protected object CreateDNSServerUpdateDNSServerDynamicParameters()

var pDeploymentName = new RuntimeDefinedParameter();
pDeploymentName.Name = "DeploymentName";
pDeploymentName.ParameterType = typeof(System.String);
pDeploymentName.ParameterType = typeof(string);
pDeploymentName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Expand All @@ -61,7 +61,7 @@ protected object CreateDNSServerUpdateDNSServerDynamicParameters()

var pDnsServerName = new RuntimeDefinedParameter();
pDnsServerName.Name = "DnsServerName";
pDnsServerName.ParameterType = typeof(System.String);
pDnsServerName.ParameterType = typeof(string);
pDnsServerName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Expand All @@ -71,25 +71,37 @@ protected object CreateDNSServerUpdateDNSServerDynamicParameters()
pDnsServerName.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("DnsServerName", pDnsServerName);

var pParameters = new RuntimeDefinedParameter();
pParameters.Name = "DNSServerUpdateDNSServerParameters";
pParameters.ParameterType = typeof(Microsoft.WindowsAzure.Management.Compute.Models.DNSUpdateParameters);
pParameters.Attributes.Add(new ParameterAttribute
var pAddress = new RuntimeDefinedParameter();
pAddress.Name = "Address";
pAddress.ParameterType = typeof(string);
pAddress.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Position = 4,
Mandatory = true
Mandatory = false
});
pParameters.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("DNSServerUpdateDNSServerParameters", pParameters);
pAddress.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("Address", pAddress);

var pName = new RuntimeDefinedParameter();
pName.Name = "Name";
pName.ParameterType = typeof(string);
pName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Position = 5,
Mandatory = false
});
pName.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("Name", pName);

var pArgumentList = new RuntimeDefinedParameter();
pArgumentList.Name = "ArgumentList";
pArgumentList.ParameterType = typeof(object[]);
pArgumentList.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByStaticParameters",
Position = 5,
Position = 6,
Mandatory = true
});
pArgumentList.Attributes.Add(new AllowNullAttribute());
Expand All @@ -103,7 +115,11 @@ protected void ExecuteDNSServerUpdateDNSServerMethod(object[] invokeMethodInputP
string serviceName = (string)ParseParameter(invokeMethodInputParameters[0]);
string deploymentName = (string)ParseParameter(invokeMethodInputParameters[1]);
string dnsServerName = (string)ParseParameter(invokeMethodInputParameters[2]);
DNSUpdateParameters parameters = (DNSUpdateParameters)ParseParameter(invokeMethodInputParameters[3]);
var parameters = new DNSUpdateParameters();
var pAddress = (string) ParseParameter(invokeMethodInputParameters[3]);
parameters.Address = string.IsNullOrEmpty(pAddress) ? null : pAddress;
var pName = (string) ParseParameter(invokeMethodInputParameters[4]);
parameters.Name = string.IsNullOrEmpty(pName) ? null : pName;

var result = DNSServerClient.UpdateDNSServer(serviceName, deploymentName, dnsServerName, parameters);
WriteObject(result);
Expand All @@ -117,9 +133,12 @@ protected PSArgument[] CreateDNSServerUpdateDNSServerParameters()
string serviceName = string.Empty;
string deploymentName = string.Empty;
string dnsServerName = string.Empty;
DNSUpdateParameters parameters = new DNSUpdateParameters();
var pAddress = string.Empty;
var pName = string.Empty;

return ConvertFromObjectsToArguments(new string[] { "ServiceName", "DeploymentName", "DnsServerName", "Parameters" }, new object[] { serviceName, deploymentName, dnsServerName, parameters });
return ConvertFromObjectsToArguments(
new string[] { "ServiceName", "DeploymentName", "DnsServerName", "Address", "Name" },
new object[] { serviceName, deploymentName, dnsServerName, pAddress, pName });
}
}
}
10 changes: 6 additions & 4 deletions ...rviceManagement.Preview/Generated/Deployment/DeploymentChangeConfigurationByNameMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected object CreateDeploymentChangeConfigurationByNameDynamicParameters()
dynamicParameters = new RuntimeDefinedParameterDictionary();
var pServiceName = new RuntimeDefinedParameter();
pServiceName.Name = "ServiceName";
pServiceName.ParameterType = typeof(System.String);
pServiceName.ParameterType = typeof(string);
pServiceName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Expand All @@ -49,7 +49,7 @@ protected object CreateDeploymentChangeConfigurationByNameDynamicParameters()

var pDeploymentName = new RuntimeDefinedParameter();
pDeploymentName.Name = "DeploymentName";
pDeploymentName.ParameterType = typeof(System.String);
pDeploymentName.ParameterType = typeof(string);
pDeploymentName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Expand All @@ -61,7 +61,7 @@ protected object CreateDeploymentChangeConfigurationByNameDynamicParameters()

var pParameters = new RuntimeDefinedParameter();
pParameters.Name = "DeploymentChangeConfigurationByNameParameters";
pParameters.ParameterType = typeof(Microsoft.WindowsAzure.Management.Compute.Models.DeploymentChangeConfigurationParameters);
pParameters.ParameterType = typeof(DeploymentChangeConfigurationParameters);
pParameters.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Expand Down Expand Up @@ -105,7 +105,9 @@ protected PSArgument[] CreateDeploymentChangeConfigurationByNameParameters()
string deploymentName = string.Empty;
DeploymentChangeConfigurationParameters parameters = new DeploymentChangeConfigurationParameters();

return ConvertFromObjectsToArguments(new string[] { "ServiceName", "DeploymentName", "Parameters" }, new object[] { serviceName, deploymentName, parameters });
return ConvertFromObjectsToArguments(
new string[] { "ServiceName", "DeploymentName", "Parameters" },
new object[] { serviceName, deploymentName, parameters });
}
}
}
26 changes: 8 additions & 18 deletions ...rviceManagement.Preview/Generated/Deployment/DeploymentChangeConfigurationBySlotMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected object CreateDeploymentChangeConfigurationBySlotDynamicParameters()
dynamicParameters = new RuntimeDefinedParameterDictionary();
var pServiceName = new RuntimeDefinedParameter();
pServiceName.Name = "ServiceName";
pServiceName.ParameterType = typeof(System.String);
pServiceName.ParameterType = typeof(string);
pServiceName.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Expand All @@ -47,25 +47,13 @@ protected object CreateDeploymentChangeConfigurationBySlotDynamicParameters()
pServiceName.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("ServiceName", pServiceName);

var pDeploymentSlot = new RuntimeDefinedParameter();
pDeploymentSlot.Name = "DeploymentSlot";
pDeploymentSlot.ParameterType = typeof(Microsoft.WindowsAzure.Management.Compute.Models.DeploymentSlot);
pDeploymentSlot.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Position = 2,
Mandatory = true
});
pDeploymentSlot.Attributes.Add(new AllowNullAttribute());
dynamicParameters.Add("DeploymentSlot", pDeploymentSlot);

var pParameters = new RuntimeDefinedParameter();
pParameters.Name = "DeploymentChangeConfigurationBySlotParameters";
pParameters.ParameterType = typeof(Microsoft.WindowsAzure.Management.Compute.Models.DeploymentChangeConfigurationParameters);
pParameters.ParameterType = typeof(DeploymentChangeConfigurationParameters);
pParameters.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByDynamicParameters",
Position = 3,
Position = 2,
Mandatory = true
});
pParameters.Attributes.Add(new AllowNullAttribute());
Expand All @@ -77,7 +65,7 @@ protected object CreateDeploymentChangeConfigurationBySlotDynamicParameters()
pArgumentList.Attributes.Add(new ParameterAttribute
{
ParameterSetName = "InvokeByStaticParameters",
Position = 4,
Position = 3,
Mandatory = true
});
pArgumentList.Attributes.Add(new AllowNullAttribute());
Expand All @@ -89,7 +77,7 @@ protected object CreateDeploymentChangeConfigurationBySlotDynamicParameters()
protected void ExecuteDeploymentChangeConfigurationBySlotMethod(object[] invokeMethodInputParameters)
{
string serviceName = (string)ParseParameter(invokeMethodInputParameters[0]);
DeploymentSlot deploymentSlot = (DeploymentSlot)ParseParameter(invokeMethodInputParameters[1]);
DeploymentSlot deploymentSlot = new DeploymentSlot();
DeploymentChangeConfigurationParameters parameters = (DeploymentChangeConfigurationParameters)ParseParameter(invokeMethodInputParameters[2]);

var result = DeploymentClient.ChangeConfigurationBySlot(serviceName, deploymentSlot, parameters);
Expand All @@ -105,7 +93,9 @@ protected PSArgument[] CreateDeploymentChangeConfigurationBySlotParameters()
DeploymentSlot deploymentSlot = new DeploymentSlot();
DeploymentChangeConfigurationParameters parameters = new DeploymentChangeConfigurationParameters();

return ConvertFromObjectsToArguments(new string[] { "ServiceName", "DeploymentSlot", "Parameters" }, new object[] { serviceName, deploymentSlot, parameters });
return ConvertFromObjectsToArguments(
new string[] { "ServiceName", "DeploymentSlot", "Parameters" },
new object[] { serviceName, deploymentSlot, parameters });
}
}
}
Loading