Skip to content

Commit 4d0bc87

Browse files
author
Ravi Teja
committed
incorporating changes
1 parent d653e2e commit 4d0bc87

File tree

5 files changed

+20
-30
lines changed

5 files changed

+20
-30
lines changed

‎src/DataBoxEdge/DataBoxEdge/Common/Cmdlets/Devices/DataBoxEdgeDeviceInvokeCmdletBase.cs renamed to ‎src/DataBoxEdge/DataBoxEdge/Common/Cmdlets/Devices/DataBoxEdgeDeviceInvokeCmdlet.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System.Collections.Generic;
1615
using System.Management.Automation;
1716
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
1817
using Microsoft.Azure.Management.EdgeGateway;
@@ -27,7 +26,7 @@ namespace Microsoft.Azure.PowerShell.Cmdlets.DataBoxEdge.Common.Cmdlets.Devices
2726
),
2827
OutputType(typeof(bool)),
2928
]
30-
public class DataBoxEdgeDeviceInvokeCmdletBase : AzureDataBoxEdgeCmdletBase
29+
public class DataBoxEdgeDeviceInvokeCmdlet : AzureDataBoxEdgeCmdletBase
3130
{
3231
private const string InvokeScanForUpdateParameterSet = "InvokeScanForUpdateParameterSet";
3332

@@ -199,7 +198,7 @@ public override void ExecuteCmdlet()
199198
}
200199
else if (this.FetchUpdate.IsPresent)
201200
{
202-
result = InstallUpdates();
201+
result = DownloadUpdates();
203202
}
204203
else if (this.InstallUpdate.IsPresent)
205204
{

‎src/DataBoxEdge/DataBoxEdge/Common/Cmdlets/Triggers/DataBoxEdgeTriggerGetCmdletBase.cs renamed to ‎src/DataBoxEdge/DataBoxEdge/Common/Cmdlets/Triggers/DataBoxEdgeTriggerGetCmdlet.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace Microsoft.Azure.PowerShell.Cmdlets.DataBoxEdge.Common.Cmdlets.Triggers
2828
{
2929
[Cmdlet(VerbsCommon.Get, Constants.Trigger, DefaultParameterSetName = ListParameterSet),
3030
OutputType(typeof(PSResourceModel))]
31-
public class DataBoxEdgeTriggerGetCmdletBase : AzureDataBoxEdgeCmdletBase
31+
public class DataBoxEdgeTriggerGetCmdlet : AzureDataBoxEdgeCmdletBase
3232
{
3333
private const string ListParameterSet = "ListParameterSet";
3434
private const string GetByNameParameterSet = "GetByNameParameterSet";
@@ -87,24 +87,23 @@ private ResourceModel GetResourceModel()
8787
return this.DataBoxEdgeManagementClient.Triggers.Get(this.DeviceName, this.Name, this.ResourceGroupName);
8888
}
8989

90-
private List<PSResourceModel> GetByResourceName()
90+
private List<PSResourceModel> ListResourceByName()
9191
{
9292
var resourceModel = GetResourceModel();
9393
return new List<PSResourceModel>() {PSResourceModel.PSDataBoxEdgeTriggerObject(resourceModel)};
9494
}
9595

9696
private IPage<ResourceModel> ListResourceModel()
9797
{
98-
return TriggersOperationsExtensions.ListByDataBoxEdgeDevice(
99-
this.DataBoxEdgeManagementClient.Triggers,
98+
return this.DataBoxEdgeManagementClient.Triggers.ListByDataBoxEdgeDevice(
10099
this.DeviceName,
101100
this.ResourceGroupName);
102101
}
103102

104103
private IPage<ResourceModel> ListResourceModel(string nextPageLink)
105104
{
106-
return TriggersOperationsExtensions.ListByDataBoxEdgeDeviceNext(
107-
this.DataBoxEdgeManagementClient.Triggers,
105+
return this.DataBoxEdgeManagementClient.Triggers.ListByDataBoxEdgeDeviceNext(
106+
108107
nextPageLink
109108
);
110109
}
@@ -113,7 +112,7 @@ private List<PSResourceModel> ListPSResourceModels()
113112
{
114113
if (!string.IsNullOrEmpty(this.Name))
115114
{
116-
return GetByResourceName();
115+
return ListResourceByName();
117116
}
118117

119118
var resourceModel = ListResourceModel();

‎src/DataBoxEdge/DataBoxEdge/Common/Cmdlets/Triggers/DataBoxEdgeTriggerNewCmdletBase.cs renamed to ‎src/DataBoxEdge/DataBoxEdge/Common/Cmdlets/Triggers/DataBoxEdgeTriggerNewCmdlet.cs

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace Microsoft.Azure.PowerShell.Cmdlets.DataBoxEdge.Common.Cmdlets.Triggers
3232
SupportsShouldProcess = true
3333
),
3434
OutputType(typeof(PSResourceModel))]
35-
public class DataBoxEdgeTriggerNewCmdletBase : AzureDataBoxEdgeCmdletBase
35+
public class DataBoxEdgeTriggerNewCmdlet : AzureDataBoxEdgeCmdletBase
3636
{
3737
private const string FileEventTriggerParameterSet = "FileEventTriggerParameterSet";
3838
private const string FileEventTriggerResourceIdParameterSet = "FileEventTriggerResourceIdParameterSet";
@@ -143,30 +143,26 @@ public class DataBoxEdgeTriggerNewCmdletBase : AzureDataBoxEdgeCmdletBase
143143
[Parameter(Mandatory = false, HelpMessage = Constants.AsJobHelpMessage)]
144144
public SwitchParameter AsJob { get; set; }
145145

146-
private ResourceModel _trigger;
147146

148147
private ResourceModel GetResourceModel()
149148
{
150-
return TriggersOperationsExtensions.Get(
151-
this.DataBoxEdgeManagementClient.Triggers,
149+
return this.DataBoxEdgeManagementClient.Triggers.Get(
152150
this.DeviceName,
153151
this.Name,
154152
this.ResourceGroupName);
155153
}
156154

157155
private string GetRoleId()
158156
{
159-
return RolesOperationsExtensions.Get(
160-
this.DataBoxEdgeManagementClient.Roles,
157+
return this.DataBoxEdgeManagementClient.Roles.Get(
161158
this.DeviceName,
162159
this.RoleName,
163160
this.ResourceGroupName).Id;
164161
}
165162

166163
private string GetShareId()
167164
{
168-
return SharesOperationsExtensions.Get(
169-
this.DataBoxEdgeManagementClient.Shares,
165+
return this.DataBoxEdgeManagementClient.Shares.Get(
170166
this.DeviceName,
171167
this.ShareName,
172168
this.ResourceGroupName).Id;
@@ -200,24 +196,25 @@ private bool DoesResourceExists()
200196

201197
private PSResourceModel CreateResourceModel()
202198
{
199+
ResourceModel trigger;
203200
var roleSinkInfo = new RoleSinkInfo(this.RoleId);
204201
if (this.FileEvent.IsPresent)
205202
{
206203
var fileSourceInfo = new FileSourceInfo(this.ShareId);
207-
_trigger = new FileEventTrigger(fileSourceInfo, roleSinkInfo, name: this.Name);
204+
trigger = new FileEventTrigger(fileSourceInfo, roleSinkInfo, name: this.Name);
208205
}
209-
else if (this.PeriodicTimerEvent.IsPresent)
206+
else
210207
{
211-
var _periodicSourceInfo = new PeriodicTimerSourceInfo(this.StartTime, this.Schedule, this.Topic);
212-
_trigger = new PeriodicTimerEventTrigger(_periodicSourceInfo, roleSinkInfo, name: this.Name);
208+
var periodicSourceInfo = new PeriodicTimerSourceInfo(this.StartTime, this.Schedule, this.Topic);
209+
trigger = new PeriodicTimerEventTrigger(periodicSourceInfo, roleSinkInfo, name: this.Name);
213210
}
214211

215212

216213
return PSResourceModel.PSDataBoxEdgeTriggerObject(TriggersOperationsExtensions.CreateOrUpdate(
217214
DataBoxEdgeManagementClient.Triggers,
218215
this.DeviceName,
219216
this.Name,
220-
_trigger,
217+
trigger,
221218
this.ResourceGroupName));
222219
}
223220

‎src/DataBoxEdge/DataBoxEdge/Common/Cmdlets/Triggers/DataBoxEdgeTriggerRemoveCmdletBase.cs renamed to ‎src/DataBoxEdge/DataBoxEdge/Common/Cmdlets/Triggers/DataBoxEdgeTriggerRemoveCmdlet.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.PowerShell.Cmdlets.DataBoxEdge.Common.Cmdlets.Triggers
2525
SupportsShouldProcess = true
2626
),
2727
OutputType(typeof(bool))]
28-
public class DataBoxEdgeTriggerRemoveCmdletBase : AzureDataBoxEdgeCmdletBase
28+
public class DataBoxEdgeTriggerRemoveCmdlet : AzureDataBoxEdgeCmdletBase
2929
{
3030
private const string DeleteByNameParameterSet = "DeleteByNameParameterSet";
3131
private const string DeleteByInputObjectParameterSet = "DeleteByInputObjectParameterSet";
@@ -82,8 +82,7 @@ public class DataBoxEdgeTriggerRemoveCmdletBase : AzureDataBoxEdgeCmdletBase
8282

8383
private bool Remove()
8484
{
85-
TriggersOperationsExtensions.Delete(
86-
this.DataBoxEdgeManagementClient.Triggers,
85+
this.DataBoxEdgeManagementClient.Triggers.Delete(
8786
this.DeviceName,
8887
this.Name,
8988
this.ResourceGroupName);

‎src/DataBoxEdge/DataBoxEdge/Common/Cmdlets/Triggers/HelpMessageTrigger.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ namespace Microsoft.Azure.PowerShell.Cmdlets.DataBoxEdge.Common.Cmdlets.Triggers
1717
{
1818
internal class HelpMessageTrigger
1919
{
20-
internal const string StorageAccountCredentialHelpMessage =
21-
"Provide existing StorageAccountCredential's Resource Name";
22-
23-
2420
internal const string NameHelpMessage = "Name of the Trigger";
2521
internal const string ObjectName = "Trigger";
2622

0 commit comments

Comments
 (0)