Skip to content

Commit 39c1eac

Browse files
author
Avijit Gupta
committed
Change Vipname to VirtualIPName
1 parent 96d7b98 commit 39c1eac

File tree

10 files changed

+30
-30
lines changed

10 files changed

+30
-30
lines changed

‎src/Common/Commands.Common/ServiceManagementTypes.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,16 +1157,16 @@ public string LoadBalancerDistribution
11571157
}
11581158
}
11591159

1160-
[DataMember(Name = "VipName", EmitDefaultValue = false, Order = 12)]
1161-
public string VipName
1160+
[DataMember(Name = "VirtualIPName", EmitDefaultValue = false, Order = 12)]
1161+
public string VirtualIPName
11621162
{
11631163
get
11641164
{
1165-
return base.GetValue<string>("VipName");
1165+
return base.GetValue<string>("VirtualIPName");
11661166
}
11671167
set
11681168
{
1169-
base.SetValue("VipName", value);
1169+
base.SetValue("VirtualIPName", value);
11701170
}
11711171
}
11721172
}

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ConfigDataInfo/AzureEndPointConfigInfo.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public enum ParameterSet { NoLB, LoadBalancedNoProbe, CustomProbe, DefaultProbe
3838
public string InternalLoadBalancerName { get; set; }
3939

4040
public string LoadBalancerDistribution { get; set; }
41-
public string VipName { get; set; }
41+
public string VirtualIPName { get; set; }
4242

4343
public AzureEndPointConfigInfo()
4444
{
@@ -55,7 +55,7 @@ public AzureEndPointConfigInfo(ParameterSet paramset,
5555
string internalLoadBalancer = null,
5656
string serviceName = null,
5757
string loadBalancerDistribution = null,
58-
string vipName = null)
58+
string VirtualIPName = null)
5959
{
6060
this.Initialize(
6161
endpointProtocol,
@@ -74,7 +74,7 @@ public AzureEndPointConfigInfo(ParameterSet paramset,
7474
internalLoadBalancer,
7575
serviceName,
7676
loadBalancerDistribution,
77-
vipName);
77+
VirtualIPName);
7878
}
7979

8080
// LoadBalancedNoProbe/DefaultProbe parameter set
@@ -90,7 +90,7 @@ public AzureEndPointConfigInfo(
9090
string internalLoadBalancer = null,
9191
string serviceName = null,
9292
string loadBalancerDistribution = null,
93-
string vipName = null)
93+
string VirtualIPName = null)
9494
{
9595
if ( (paramset == ParameterSet.LoadBalancedNoProbe) || (paramset == ParameterSet.DefaultProbe) )
9696
{
@@ -111,7 +111,7 @@ public AzureEndPointConfigInfo(
111111
internalLoadBalancer,
112112
serviceName,
113113
loadBalancerDistribution,
114-
vipName);
114+
VirtualIPName);
115115
}
116116
}
117117

@@ -133,7 +133,7 @@ public AzureEndPointConfigInfo(
133133
string internalLoadBalancer= null,
134134
string serviceName = null,
135135
string loadBalancerDistribution = null,
136-
string vipName = null)
136+
string VirtualIPName = null)
137137
{
138138
this.Initialize(
139139
endpointProtocol,
@@ -152,7 +152,7 @@ public AzureEndPointConfigInfo(
152152
internalLoadBalancer,
153153
serviceName,
154154
loadBalancerDistribution,
155-
vipName);
155+
VirtualIPName);
156156
}
157157

158158
public AzureEndPointConfigInfo(AzureEndPointConfigInfo other)
@@ -174,7 +174,7 @@ public AzureEndPointConfigInfo(AzureEndPointConfigInfo other)
174174
other.InternalLoadBalancerName,
175175
other.ServiceName,
176176
other.LoadBalancerDistribution,
177-
other.VipName);
177+
other.VirtualIPName);
178178
}
179179

180180
private void Initialize(
@@ -194,7 +194,7 @@ private void Initialize(
194194
string internalLoadBalancer,
195195
string serviceName,
196196
string loadBalancerDistribution,
197-
string vipName)
197+
string VirtualIPName)
198198
{
199199
this.EndpointLocalPort = internalPort;
200200
this.EndpointProtocol = protocol;
@@ -213,7 +213,7 @@ private void Initialize(
213213
this.InternalLoadBalancerName = internalLoadBalancer;
214214
this.ServiceName = serviceName;
215215
this.LoadBalancerDistribution = loadBalancerDistribution;
216-
this.VipName = vipName;
216+
this.VirtualIPName = VirtualIPName;
217217
}
218218

219219
public bool CheckInputEndpointContext(InputEndpointContext context)

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/AddAzureEndpointCmdletInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ public AddAzureEndpointCmdletInfo(AzureEndPointConfigInfo endPointConfig)
7979
{
8080
this.cmdletParams.Add(new CmdletParam("LoadBalancerDistribution", endPointConfig.LoadBalancerDistribution));
8181
}
82-
if (!string.IsNullOrEmpty(endPointConfig.VipName))
82+
if (!string.IsNullOrEmpty(endPointConfig.VirtualIPName))
8383
{
84-
this.cmdletParams.Add(new CmdletParam("VipName", endPointConfig.VipName));
84+
this.cmdletParams.Add(new CmdletParam("VirtualIPName", endPointConfig.VirtualIPName));
8585
}
8686
}
8787

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/SetAzureEndpointCmdletInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ public SetAzureEndpointCmdletInfo(AzureEndPointConfigInfo endPointConfig)
4848
{
4949
this.cmdletParams.Add(new CmdletParam("LoadBalancerDistribution", endPointConfig.LoadBalancerDistribution));
5050
}
51-
if (!string.IsNullOrEmpty(endPointConfig.VipName))
51+
if (!string.IsNullOrEmpty(endPointConfig.VirtualIPName))
5252
{
53-
this.cmdletParams.Add(new CmdletParam("VipName", endPointConfig.VipName));
53+
this.cmdletParams.Add(new CmdletParam("VirtualIPName", endPointConfig.VirtualIPName));
5454
}
5555
}
5656
}

‎src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Endpoints/AddAzureEndpoint.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public class AddAzureEndpoint : VirtualMachineConfigurationCmdletBase
100100

101101
[Parameter(HelpMessage = "The Virtual IP Name of the Virtual IP on which the endpoint is to be added.")]
102102
[ValidateNotNullOrEmpty]
103-
public string VipName
103+
public string VirtualIPName
104104
{
105105
get;
106106
set;
@@ -134,7 +134,7 @@ internal void ExecuteCommand()
134134
LoadBalancerName = this.InternalLoadBalancerName,
135135
IdleTimeoutInMinutes = this.ParameterSpecified("IdleTimeoutInMinutes") ? this.IdleTimeoutInMinutes : null,
136136
LoadBalancerDistribution = this.ParameterSpecified("LoadBalancerDistribution") ? this.LoadBalancerDistribution : null,
137-
VipName = this.ParameterSpecified("VipName") ? this.VipName : null,
137+
VirtualIPName = this.ParameterSpecified("VirtualIPName") ? this.VirtualIPName : null,
138138
};
139139

140140
if (this.ParameterSetName == AddAzureEndpoint.LBNoProbeParameterSet

‎src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Endpoints/GetAzureEndpoint.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ protected Collection<InputEndpointContext> GetInputEndpoints()
7878
InternalLoadBalancerName = ep.LoadBalancerName,
7979
IdleTimeoutInMinutes = ep.IdleTimeoutInMinutes,
8080
LoadBalancerDistribution = ep.LoadBalancerDistribution,
81-
VipName = ep.VipName
81+
VirtualIPName = ep.VirtualIPName
8282
};
8383

8484
if (ep.LoadBalancerProbe != null && string.IsNullOrEmpty(endpointCtx.LBSetName) == false)

‎src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Endpoints/SetAzureEndpoint.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public string LoadBalancerDistribution
101101

102102
[Parameter(HelpMessage = "The Virtual IP Name of the Virtual IP on which the endpoint is to be added.")]
103103
[ValidateNotNullOrEmpty]
104-
public string VipName
104+
public string VirtualIPName
105105
{
106106
get;
107107
set;
@@ -163,9 +163,9 @@ internal void ExecuteCommand()
163163
{
164164
endpoint.LoadBalancerDistribution = this.LoadBalancerDistribution;
165165
}
166-
if (this.ParameterSpecified("VipName"))
166+
if (this.ParameterSpecified("VirtualIPName"))
167167
{
168-
endpoint.VipName = this.VipName;
168+
endpoint.VirtualIPName = this.VirtualIPName;
169169
}
170170

171171
WriteObject(VM, true);

‎src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Endpoints/SetAzureLoadBalancedEndpoint.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public class SetAzureLoadBalancedEndpoint : IaaSDeploymentManagementCmdletBase
9191

9292
[Parameter(HelpMessage = "The Virtual IP Name of the Virtual IP on which the endpoint is to be added.")]
9393
[ValidateNotNullOrEmpty]
94-
public string VipName
94+
public string VirtualIPName
9595
{
9696
get;
9797
set;
@@ -158,7 +158,7 @@ protected override void ExecuteCommand()
158158
LoadBalancerName = this.InternalLoadBalancerName,
159159
IdleTimeoutInMinutes = endpoint.IdleTimeoutInMinutes,
160160
LoadBalancerDistribution = endpoint.LoadBalancerDistribution,
161-
VipName = endpoint.VipName,
161+
VirtualIPName = endpoint.VirtualIPName,
162162
}).ToList()
163163
};
164164

@@ -218,9 +218,9 @@ private void UpdateEndpointProperties(PVM.InputEndpoint endpoint)
218218
endpoint.LoadBalancerDistribution = this.LoadBalancerDistribution;
219219
}
220220

221-
if (this.ParameterSpecified("VipName"))
221+
if (this.ParameterSpecified("VirtualIPName"))
222222
{
223-
endpoint.VipName = this.VipName;
223+
endpoint.VirtualIPName = this.VirtualIPName;
224224
}
225225

226226
if (this.ParameterSpecified("DirectServerReturn"))

‎src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/NewAzureReservedIP.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public string VirtualIPName
7676
set;
7777
}
7878

79-
[Parameter(Position = 5, Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ReserveInUseIPParamSet, HelpMessage = "Deployment slot [Staging | Production].")]
79+
[Parameter(Position = 5, Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ReserveInUseIPParamSet, HelpMessage = "Deployment slot [Staging | Production].")]
8080
[ValidateSet(Microsoft.WindowsAzure.Commands.ServiceManagement.Model.DeploymentSlotType.Staging, Microsoft.WindowsAzure.Commands.ServiceManagement.Model.DeploymentSlotType.Production, IgnoreCase = true)]
8181
[ValidateNotNullOrEmpty]
8282
public string Slot

‎src/ServiceManagement/Compute/Commands.ServiceManagement/Model/InputEndpointContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ public class InputEndpointContext
4848

4949
public string LoadBalancerDistribution { get; set; }
5050

51-
public string VipName { get; set; }
51+
public string VirtualIPName { get; set; }
5252
}
5353
}

0 commit comments

Comments
 (0)