Skip to content

Commit 7bf9d2c

Browse files
AzureRTAzureRT
committed
Merge pull request #60 from hyonholee/vmss
Fix auto-generator and update generated codes.
2 parents 67e857f + 17f77a5 commit 7bf9d2c

File tree

104 files changed

+6986
-4466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+6986
-4466
lines changed

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,6 +1441,7 @@ function Write-OperationCmdletFile
14411441

14421442
if ($only_strings)
14431443
{
1444+
$create_local_param_definition = "";
14441445
# Case 1: the parameter type contains only string types.
14451446
foreach ($param in $does_contain_only_strings)
14461447
{

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Generated/ComputeAutomationBaseCmdlet.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ protected static PSArgument[] ConvertFromObjectsToArguments(string[] names, obje
5151

5252
protected static object[] ConvertFromArgumentsToObjects(object[] arguments)
5353
{
54+
if (arguments == null)
55+
{
56+
return null;
57+
}
58+
5459
var objects = new object[arguments.Length];
5560

5661
for (int index = 0; index < arguments.Length; index++)

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Generated/DNSServer/DNSServerAddDNSServerMethod.cs

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected object CreateDNSServerAddDNSServerDynamicParameters()
3737
dynamicParameters = new RuntimeDefinedParameterDictionary();
3838
var pServiceName = new RuntimeDefinedParameter();
3939
pServiceName.Name = "ServiceName";
40-
pServiceName.ParameterType = typeof(System.String);
40+
pServiceName.ParameterType = typeof(string);
4141
pServiceName.Attributes.Add(new ParameterAttribute
4242
{
4343
ParameterSetName = "InvokeByDynamicParameters",
@@ -49,7 +49,7 @@ protected object CreateDNSServerAddDNSServerDynamicParameters()
4949

5050
var pDeploymentName = new RuntimeDefinedParameter();
5151
pDeploymentName.Name = "DeploymentName";
52-
pDeploymentName.ParameterType = typeof(System.String);
52+
pDeploymentName.ParameterType = typeof(string);
5353
pDeploymentName.Attributes.Add(new ParameterAttribute
5454
{
5555
ParameterSetName = "InvokeByDynamicParameters",
@@ -59,25 +59,37 @@ protected object CreateDNSServerAddDNSServerDynamicParameters()
5959
pDeploymentName.Attributes.Add(new AllowNullAttribute());
6060
dynamicParameters.Add("DeploymentName", pDeploymentName);
6161

62-
var pParameters = new RuntimeDefinedParameter();
63-
pParameters.Name = "DNSServerAddDNSServerParameters";
64-
pParameters.ParameterType = typeof(Microsoft.WindowsAzure.Management.Compute.Models.DNSAddParameters);
65-
pParameters.Attributes.Add(new ParameterAttribute
62+
var pAddress = new RuntimeDefinedParameter();
63+
pAddress.Name = "Address";
64+
pAddress.ParameterType = typeof(string);
65+
pAddress.Attributes.Add(new ParameterAttribute
6666
{
6767
ParameterSetName = "InvokeByDynamicParameters",
6868
Position = 3,
69-
Mandatory = true
69+
Mandatory = false
7070
});
71-
pParameters.Attributes.Add(new AllowNullAttribute());
72-
dynamicParameters.Add("DNSServerAddDNSServerParameters", pParameters);
71+
pAddress.Attributes.Add(new AllowNullAttribute());
72+
dynamicParameters.Add("Address", pAddress);
73+
74+
var pName = new RuntimeDefinedParameter();
75+
pName.Name = "Name";
76+
pName.ParameterType = typeof(string);
77+
pName.Attributes.Add(new ParameterAttribute
78+
{
79+
ParameterSetName = "InvokeByDynamicParameters",
80+
Position = 4,
81+
Mandatory = false
82+
});
83+
pName.Attributes.Add(new AllowNullAttribute());
84+
dynamicParameters.Add("Name", pName);
7385

7486
var pArgumentList = new RuntimeDefinedParameter();
7587
pArgumentList.Name = "ArgumentList";
7688
pArgumentList.ParameterType = typeof(object[]);
7789
pArgumentList.Attributes.Add(new ParameterAttribute
7890
{
7991
ParameterSetName = "InvokeByStaticParameters",
80-
Position = 4,
92+
Position = 5,
8193
Mandatory = true
8294
});
8395
pArgumentList.Attributes.Add(new AllowNullAttribute());
@@ -90,7 +102,11 @@ protected void ExecuteDNSServerAddDNSServerMethod(object[] invokeMethodInputPara
90102
{
91103
string serviceName = (string)ParseParameter(invokeMethodInputParameters[0]);
92104
string deploymentName = (string)ParseParameter(invokeMethodInputParameters[1]);
93-
DNSAddParameters parameters = (DNSAddParameters)ParseParameter(invokeMethodInputParameters[2]);
105+
var parameters = new DNSAddParameters();
106+
var pAddress = (string) ParseParameter(invokeMethodInputParameters[2]);
107+
parameters.Address = string.IsNullOrEmpty(pAddress) ? null : pAddress;
108+
var pName = (string) ParseParameter(invokeMethodInputParameters[3]);
109+
parameters.Name = string.IsNullOrEmpty(pName) ? null : pName;
94110

95111
var result = DNSServerClient.AddDNSServer(serviceName, deploymentName, parameters);
96112
WriteObject(result);
@@ -103,9 +119,12 @@ protected PSArgument[] CreateDNSServerAddDNSServerParameters()
103119
{
104120
string serviceName = string.Empty;
105121
string deploymentName = string.Empty;
106-
DNSAddParameters parameters = new DNSAddParameters();
122+
var pAddress = string.Empty;
123+
var pName = string.Empty;
107124

108-
return ConvertFromObjectsToArguments(new string[] { "ServiceName", "DeploymentName", "Parameters" }, new object[] { serviceName, deploymentName, parameters });
125+
return ConvertFromObjectsToArguments(
126+
new string[] { "ServiceName", "DeploymentName", "Address", "Name" },
127+
new object[] { serviceName, deploymentName, pAddress, pName });
109128
}
110129
}
111130
}

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Generated/DNSServer/DNSServerDeleteDNSServerMethod.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected object CreateDNSServerDeleteDNSServerDynamicParameters()
3737
dynamicParameters = new RuntimeDefinedParameterDictionary();
3838
var pServiceName = new RuntimeDefinedParameter();
3939
pServiceName.Name = "ServiceName";
40-
pServiceName.ParameterType = typeof(System.String);
40+
pServiceName.ParameterType = typeof(string);
4141
pServiceName.Attributes.Add(new ParameterAttribute
4242
{
4343
ParameterSetName = "InvokeByDynamicParameters",
@@ -49,7 +49,7 @@ protected object CreateDNSServerDeleteDNSServerDynamicParameters()
4949

5050
var pDeploymentName = new RuntimeDefinedParameter();
5151
pDeploymentName.Name = "DeploymentName";
52-
pDeploymentName.ParameterType = typeof(System.String);
52+
pDeploymentName.ParameterType = typeof(string);
5353
pDeploymentName.Attributes.Add(new ParameterAttribute
5454
{
5555
ParameterSetName = "InvokeByDynamicParameters",
@@ -61,7 +61,7 @@ protected object CreateDNSServerDeleteDNSServerDynamicParameters()
6161

6262
var pDnsServerName = new RuntimeDefinedParameter();
6363
pDnsServerName.Name = "DnsServerName";
64-
pDnsServerName.ParameterType = typeof(System.String);
64+
pDnsServerName.ParameterType = typeof(string);
6565
pDnsServerName.Attributes.Add(new ParameterAttribute
6666
{
6767
ParameterSetName = "InvokeByDynamicParameters",
@@ -105,7 +105,9 @@ protected PSArgument[] CreateDNSServerDeleteDNSServerParameters()
105105
string deploymentName = string.Empty;
106106
string dnsServerName = string.Empty;
107107

108-
return ConvertFromObjectsToArguments(new string[] { "ServiceName", "DeploymentName", "DnsServerName" }, new object[] { serviceName, deploymentName, dnsServerName });
108+
return ConvertFromObjectsToArguments(
109+
new string[] { "ServiceName", "DeploymentName", "DnsServerName" },
110+
new object[] { serviceName, deploymentName, dnsServerName });
109111
}
110112
}
111113
}

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Generated/DNSServer/DNSServerUpdateDNSServerMethod.cs

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected object CreateDNSServerUpdateDNSServerDynamicParameters()
3737
dynamicParameters = new RuntimeDefinedParameterDictionary();
3838
var pServiceName = new RuntimeDefinedParameter();
3939
pServiceName.Name = "ServiceName";
40-
pServiceName.ParameterType = typeof(System.String);
40+
pServiceName.ParameterType = typeof(string);
4141
pServiceName.Attributes.Add(new ParameterAttribute
4242
{
4343
ParameterSetName = "InvokeByDynamicParameters",
@@ -49,7 +49,7 @@ protected object CreateDNSServerUpdateDNSServerDynamicParameters()
4949

5050
var pDeploymentName = new RuntimeDefinedParameter();
5151
pDeploymentName.Name = "DeploymentName";
52-
pDeploymentName.ParameterType = typeof(System.String);
52+
pDeploymentName.ParameterType = typeof(string);
5353
pDeploymentName.Attributes.Add(new ParameterAttribute
5454
{
5555
ParameterSetName = "InvokeByDynamicParameters",
@@ -61,7 +61,7 @@ protected object CreateDNSServerUpdateDNSServerDynamicParameters()
6161

6262
var pDnsServerName = new RuntimeDefinedParameter();
6363
pDnsServerName.Name = "DnsServerName";
64-
pDnsServerName.ParameterType = typeof(System.String);
64+
pDnsServerName.ParameterType = typeof(string);
6565
pDnsServerName.Attributes.Add(new ParameterAttribute
6666
{
6767
ParameterSetName = "InvokeByDynamicParameters",
@@ -71,25 +71,37 @@ protected object CreateDNSServerUpdateDNSServerDynamicParameters()
7171
pDnsServerName.Attributes.Add(new AllowNullAttribute());
7272
dynamicParameters.Add("DnsServerName", pDnsServerName);
7373

74-
var pParameters = new RuntimeDefinedParameter();
75-
pParameters.Name = "DNSServerUpdateDNSServerParameters";
76-
pParameters.ParameterType = typeof(Microsoft.WindowsAzure.Management.Compute.Models.DNSUpdateParameters);
77-
pParameters.Attributes.Add(new ParameterAttribute
74+
var pAddress = new RuntimeDefinedParameter();
75+
pAddress.Name = "Address";
76+
pAddress.ParameterType = typeof(string);
77+
pAddress.Attributes.Add(new ParameterAttribute
7878
{
7979
ParameterSetName = "InvokeByDynamicParameters",
8080
Position = 4,
81-
Mandatory = true
81+
Mandatory = false
8282
});
83-
pParameters.Attributes.Add(new AllowNullAttribute());
84-
dynamicParameters.Add("DNSServerUpdateDNSServerParameters", pParameters);
83+
pAddress.Attributes.Add(new AllowNullAttribute());
84+
dynamicParameters.Add("Address", pAddress);
85+
86+
var pName = new RuntimeDefinedParameter();
87+
pName.Name = "Name";
88+
pName.ParameterType = typeof(string);
89+
pName.Attributes.Add(new ParameterAttribute
90+
{
91+
ParameterSetName = "InvokeByDynamicParameters",
92+
Position = 5,
93+
Mandatory = false
94+
});
95+
pName.Attributes.Add(new AllowNullAttribute());
96+
dynamicParameters.Add("Name", pName);
8597

8698
var pArgumentList = new RuntimeDefinedParameter();
8799
pArgumentList.Name = "ArgumentList";
88100
pArgumentList.ParameterType = typeof(object[]);
89101
pArgumentList.Attributes.Add(new ParameterAttribute
90102
{
91103
ParameterSetName = "InvokeByStaticParameters",
92-
Position = 5,
104+
Position = 6,
93105
Mandatory = true
94106
});
95107
pArgumentList.Attributes.Add(new AllowNullAttribute());
@@ -103,7 +115,11 @@ protected void ExecuteDNSServerUpdateDNSServerMethod(object[] invokeMethodInputP
103115
string serviceName = (string)ParseParameter(invokeMethodInputParameters[0]);
104116
string deploymentName = (string)ParseParameter(invokeMethodInputParameters[1]);
105117
string dnsServerName = (string)ParseParameter(invokeMethodInputParameters[2]);
106-
DNSUpdateParameters parameters = (DNSUpdateParameters)ParseParameter(invokeMethodInputParameters[3]);
118+
var parameters = new DNSUpdateParameters();
119+
var pAddress = (string) ParseParameter(invokeMethodInputParameters[3]);
120+
parameters.Address = string.IsNullOrEmpty(pAddress) ? null : pAddress;
121+
var pName = (string) ParseParameter(invokeMethodInputParameters[4]);
122+
parameters.Name = string.IsNullOrEmpty(pName) ? null : pName;
107123

108124
var result = DNSServerClient.UpdateDNSServer(serviceName, deploymentName, dnsServerName, parameters);
109125
WriteObject(result);
@@ -117,9 +133,12 @@ protected PSArgument[] CreateDNSServerUpdateDNSServerParameters()
117133
string serviceName = string.Empty;
118134
string deploymentName = string.Empty;
119135
string dnsServerName = string.Empty;
120-
DNSUpdateParameters parameters = new DNSUpdateParameters();
136+
var pAddress = string.Empty;
137+
var pName = string.Empty;
121138

122-
return ConvertFromObjectsToArguments(new string[] { "ServiceName", "DeploymentName", "DnsServerName", "Parameters" }, new object[] { serviceName, deploymentName, dnsServerName, parameters });
139+
return ConvertFromObjectsToArguments(
140+
new string[] { "ServiceName", "DeploymentName", "DnsServerName", "Address", "Name" },
141+
new object[] { serviceName, deploymentName, dnsServerName, pAddress, pName });
123142
}
124143
}
125144
}

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Generated/Deployment/DeploymentChangeConfigurationByNameMethod.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected object CreateDeploymentChangeConfigurationByNameDynamicParameters()
3737
dynamicParameters = new RuntimeDefinedParameterDictionary();
3838
var pServiceName = new RuntimeDefinedParameter();
3939
pServiceName.Name = "ServiceName";
40-
pServiceName.ParameterType = typeof(System.String);
40+
pServiceName.ParameterType = typeof(string);
4141
pServiceName.Attributes.Add(new ParameterAttribute
4242
{
4343
ParameterSetName = "InvokeByDynamicParameters",
@@ -49,7 +49,7 @@ protected object CreateDeploymentChangeConfigurationByNameDynamicParameters()
4949

5050
var pDeploymentName = new RuntimeDefinedParameter();
5151
pDeploymentName.Name = "DeploymentName";
52-
pDeploymentName.ParameterType = typeof(System.String);
52+
pDeploymentName.ParameterType = typeof(string);
5353
pDeploymentName.Attributes.Add(new ParameterAttribute
5454
{
5555
ParameterSetName = "InvokeByDynamicParameters",
@@ -61,7 +61,7 @@ protected object CreateDeploymentChangeConfigurationByNameDynamicParameters()
6161

6262
var pParameters = new RuntimeDefinedParameter();
6363
pParameters.Name = "DeploymentChangeConfigurationByNameParameters";
64-
pParameters.ParameterType = typeof(Microsoft.WindowsAzure.Management.Compute.Models.DeploymentChangeConfigurationParameters);
64+
pParameters.ParameterType = typeof(DeploymentChangeConfigurationParameters);
6565
pParameters.Attributes.Add(new ParameterAttribute
6666
{
6767
ParameterSetName = "InvokeByDynamicParameters",
@@ -105,7 +105,9 @@ protected PSArgument[] CreateDeploymentChangeConfigurationByNameParameters()
105105
string deploymentName = string.Empty;
106106
DeploymentChangeConfigurationParameters parameters = new DeploymentChangeConfigurationParameters();
107107

108-
return ConvertFromObjectsToArguments(new string[] { "ServiceName", "DeploymentName", "Parameters" }, new object[] { serviceName, deploymentName, parameters });
108+
return ConvertFromObjectsToArguments(
109+
new string[] { "ServiceName", "DeploymentName", "Parameters" },
110+
new object[] { serviceName, deploymentName, parameters });
109111
}
110112
}
111113
}

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Generated/Deployment/DeploymentChangeConfigurationBySlotMethod.cs

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected object CreateDeploymentChangeConfigurationBySlotDynamicParameters()
3737
dynamicParameters = new RuntimeDefinedParameterDictionary();
3838
var pServiceName = new RuntimeDefinedParameter();
3939
pServiceName.Name = "ServiceName";
40-
pServiceName.ParameterType = typeof(System.String);
40+
pServiceName.ParameterType = typeof(string);
4141
pServiceName.Attributes.Add(new ParameterAttribute
4242
{
4343
ParameterSetName = "InvokeByDynamicParameters",
@@ -47,25 +47,13 @@ protected object CreateDeploymentChangeConfigurationBySlotDynamicParameters()
4747
pServiceName.Attributes.Add(new AllowNullAttribute());
4848
dynamicParameters.Add("ServiceName", pServiceName);
4949

50-
var pDeploymentSlot = new RuntimeDefinedParameter();
51-
pDeploymentSlot.Name = "DeploymentSlot";
52-
pDeploymentSlot.ParameterType = typeof(Microsoft.WindowsAzure.Management.Compute.Models.DeploymentSlot);
53-
pDeploymentSlot.Attributes.Add(new ParameterAttribute
54-
{
55-
ParameterSetName = "InvokeByDynamicParameters",
56-
Position = 2,
57-
Mandatory = true
58-
});
59-
pDeploymentSlot.Attributes.Add(new AllowNullAttribute());
60-
dynamicParameters.Add("DeploymentSlot", pDeploymentSlot);
61-
6250
var pParameters = new RuntimeDefinedParameter();
6351
pParameters.Name = "DeploymentChangeConfigurationBySlotParameters";
64-
pParameters.ParameterType = typeof(Microsoft.WindowsAzure.Management.Compute.Models.DeploymentChangeConfigurationParameters);
52+
pParameters.ParameterType = typeof(DeploymentChangeConfigurationParameters);
6553
pParameters.Attributes.Add(new ParameterAttribute
6654
{
6755
ParameterSetName = "InvokeByDynamicParameters",
68-
Position = 3,
56+
Position = 2,
6957
Mandatory = true
7058
});
7159
pParameters.Attributes.Add(new AllowNullAttribute());
@@ -77,7 +65,7 @@ protected object CreateDeploymentChangeConfigurationBySlotDynamicParameters()
7765
pArgumentList.Attributes.Add(new ParameterAttribute
7866
{
7967
ParameterSetName = "InvokeByStaticParameters",
80-
Position = 4,
68+
Position = 3,
8169
Mandatory = true
8270
});
8371
pArgumentList.Attributes.Add(new AllowNullAttribute());
@@ -89,7 +77,7 @@ protected object CreateDeploymentChangeConfigurationBySlotDynamicParameters()
8977
protected void ExecuteDeploymentChangeConfigurationBySlotMethod(object[] invokeMethodInputParameters)
9078
{
9179
string serviceName = (string)ParseParameter(invokeMethodInputParameters[0]);
92-
DeploymentSlot deploymentSlot = (DeploymentSlot)ParseParameter(invokeMethodInputParameters[1]);
80+
DeploymentSlot deploymentSlot = new DeploymentSlot();
9381
DeploymentChangeConfigurationParameters parameters = (DeploymentChangeConfigurationParameters)ParseParameter(invokeMethodInputParameters[2]);
9482

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

108-
return ConvertFromObjectsToArguments(new string[] { "ServiceName", "DeploymentSlot", "Parameters" }, new object[] { serviceName, deploymentSlot, parameters });
96+
return ConvertFromObjectsToArguments(
97+
new string[] { "ServiceName", "DeploymentSlot", "Parameters" },
98+
new object[] { serviceName, deploymentSlot, parameters });
10999
}
110100
}
111101
}

0 commit comments

Comments
 (0)