diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index 52ed86acd314..a8a2cfbf001c 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -733,6 +733,15 @@ + + + + + + + + + @@ -820,6 +829,9 @@ + + + @@ -1062,6 +1074,15 @@ + + + + + + + + + @@ -1219,6 +1240,15 @@ + + + + + + + + + @@ -1240,6 +1270,9 @@ + + + @@ -1362,6 +1395,9 @@ + + + @@ -1860,6 +1896,15 @@ + + + + + + + + + @@ -1875,6 +1920,9 @@ + + + @@ -1890,6 +1938,9 @@ + + + @@ -2210,6 +2261,15 @@ + + + + + + + + + @@ -2255,6 +2315,9 @@ + + + @@ -4824,6 +4887,9 @@ + + + @@ -4853,6 +4919,7 @@ + @@ -4923,6 +4990,9 @@ + + + @@ -4974,6 +5044,9 @@ + + + @@ -4981,6 +5054,7 @@ + @@ -5021,6 +5095,7 @@ + @@ -5183,16 +5258,21 @@ + + + + + @@ -5297,6 +5377,9 @@ + + + @@ -5312,6 +5395,7 @@ + diff --git a/src/ResourceManager.sln b/src/ResourceManager.sln index 64379a37db40..53241051824d 100644 --- a/src/ResourceManager.sln +++ b/src/ResourceManager.sln @@ -149,10 +149,10 @@ Global {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Debug|Any CPU.Build.0 = Debug|Any CPU {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.ActiveCfg = Release|Any CPU {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.Build.0 = Release|Any CPU - {127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Release|Any CPU.Build.0 = Release|Any CPU + {59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Release|Any CPU.Build.0 = Release|Any CPU {80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.Build.0 = Debug|Any CPU {80A92297-7C92-456B-8EE7-9FB6CE30149D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -198,7 +198,6 @@ Global {080B0477-7E52-4455-90AB-23BD13D1B1CE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} {56ED8C97-53B9-4DF6-ACB5-7E6800105BF8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} {7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} - {127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} {13E031E4-8A43-4B87-9D72-D70180C31C11} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} {469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} {133561EC-99AF-4ADC-AF41-39C4D3AD323B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj index 6ba04756996a..76cd5d89dbec 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj @@ -63,8 +63,8 @@ False ..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll - - ..\..\..\packages\Microsoft.Azure.Management.DataFactories.1.0.1\lib\net40\Microsoft.Azure.Management.DataFactories.dll + + ..\..\..\packages\Microsoft.Azure.Management.DataFactories.1.0.2\lib\net45\Microsoft.Azure.Management.DataFactories.dll ..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll @@ -148,7 +148,7 @@ - + @@ -161,10 +161,10 @@ - + - + @@ -184,7 +184,7 @@ PreserveNewest - + PreserveNewest diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/table.json b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/dataset.json similarity index 100% rename from src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/table.json rename to src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/dataset.json diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/TableTests.ps1 b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/TableTests.ps1 index ae250fe2f26c..9756c8c5449e 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/TableTests.ps1 +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/TableTests.ps1 @@ -14,8 +14,8 @@ <# .SYNOPSIS -Create a table and the linked service which it depends on. Then do a Get to compare the result are identical. -Delete the created table after test finishes. +Create a dataset and the linked service which it depends on. Then do a Get to compare the result are identical. +Delete the created dataset after test finishes. #> function Test-Table { @@ -32,15 +32,15 @@ function Test-Table New-AzureDataFactoryLinkedService -ResourceGroupName $rgname -DataFactoryName $dfname -File .\Resources\linkedService.json -Force - $tblname = "foo2" - $actual = New-AzureDataFactoryTable -ResourceGroupName $rgname -DataFactoryName $dfname -Name $tblname -File .\Resources\table.json -Force - $expected = Get-AzureDataFactoryTable -ResourceGroupName $rgname -DataFactoryName $dfname -Name $tblname + $datasetname = "foo2" + $actual = New-AzureDataFactoryDataset -ResourceGroupName $rgname -DataFactoryName $dfname -Name $datasetname -File .\Resources\dataset.json -Force + $expected = Get-AzureDataFactoryDataset -ResourceGroupName $rgname -DataFactoryName $dfname -Name $datasetname Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName Assert-AreEqual $expected.DataFactoryName $actual.DataFactoryName - Assert-AreEqual $expected.TableName $actual.TableName + Assert-AreEqual $expected.DatasetName $actual.DatasetName - Remove-AzureDataFactoryTable -ResourceGroupName $rgname -DataFactoryName $dfname -Name $tblname -Force + Remove-AzureDataFactoryDataset -ResourceGroupName $rgname -DataFactoryName $dfname -Name $datasetname -Force } finally { @@ -50,8 +50,8 @@ function Test-Table <# .SYNOPSIS -Create a table and the linked service which it depends on. Then do a Get to compare the result are identical. -Delete the created table after test finishes. +Create a dataset and the linked service which it depends on. Then do a Get to compare the result are identical. +Delete the created dataset after test finishes. Use -DataFactory parameter in all cmdlets. #> function Test-TableWithDataFactoryParameter @@ -69,15 +69,15 @@ function Test-TableWithDataFactoryParameter New-AzureDataFactoryLinkedService -ResourceGroupName $rgname -DataFactoryName $dfname -File .\Resources\linkedService.json -Force - $tblname = "foo2" - $actual = New-AzureDataFactoryTable -DataFactory $df -Name $tblname -File .\Resources\table.json -Force - $expected = Get-AzureDataFactoryTable -DataFactory $df -Name $tblname + $datasetname = "foo2" + $actual = New-AzureDataFactoryDataset -DataFactory $df -Name $datasetname -File .\Resources\dataset.json -Force + $expected = Get-AzureDataFactoryDataset -DataFactory $df -Name $datasetname Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName Assert-AreEqual $expected.DataFactoryName $actual.DataFactoryName - Assert-AreEqual $expected.TableName $actual.TableName + Assert-AreEqual $expected.DatasetName $actual.DatasetName - Remove-AzureDataFactoryTable -DataFactory $df -Name $tblname -Force + Remove-AzureDataFactoryDataset -DataFactory $df -Name $datasetname -Force } finally { @@ -104,13 +104,14 @@ function Test-TablePiping New-AzureDataFactoryLinkedService -ResourceGroupName $rgname -DataFactoryName $dfname -File .\Resources\linkedService.json -Force - $tblname = "foo2" - New-AzureDataFactoryTable -ResourceGroupName $rgname -DataFactoryName $dfname -Name $tblname -File .\Resources\table.json -Force + $datasetname = "foo2" + New-AzureDataFactoryDataset -ResourceGroupName $rgname -DataFactoryName $dfname -Name $datasetname -File .\Resources\dataset.json -Force - Get-AzureDataFactoryTable -ResourceGroupName $rgname -DataFactoryName $dfname -Name $tblname | Remove-AzureDataFactoryTable -Force + Get-AzureDataFactoryDataset -ResourceGroupName $rgname -DataFactoryName $dfname -Name $datasetname | Remove-AzureDataFactoryDataset -Force - # Test the table no longer exists - Assert-ThrowsContains { Get-AzureDataFactoryTable -ResourceGroupName $rgname -DataFactoryName $dfname -Name $tblname } "TableNotFound" + # Test the dataset no longer exists + # TODO bgold09: change expected error message to "DatasetNotFound" after service error messages have been updated + Assert-ThrowsContains { Get-AzureDataFactoryDataset -ResourceGroupName $rgname -DataFactoryName $dfname -Name $datasetname } "TableNotFound" } finally { diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/GetTableTests.cs b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/GetDatasetTests.cs similarity index 79% rename from src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/GetTableTests.cs rename to src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/GetDatasetTests.cs index ed36d9a58dc3..002799c78612 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/GetTableTests.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/GetDatasetTests.cs @@ -22,17 +22,17 @@ namespace Microsoft.Azure.Commands.DataFactories.Test { - public class GetTableTests : DataFactoryUnitTestBase + public class GetDatasetTests : DataFactoryUnitTestBase { - private const string tableName = "foo"; + private const string datasetName = "foo"; - private GetAzureDataFactoryTableCommand cmdlet; + private GetAzureDataFactoryDatasetCommand cmdlet; - public GetTableTests() + public GetDatasetTests() { base.SetupTest(); - cmdlet = new GetAzureDataFactoryTableCommand() + cmdlet = new GetAzureDataFactoryDatasetCommand() { CommandRuntime = commandRuntimeMock.Object, DataFactoryClient = dataFactoriesClientMock.Object, @@ -43,12 +43,12 @@ public GetTableTests() [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] - public void CanGetTable() + public void CanGetDataset() { // Arrange - PSTable expected = new PSTable() + PSDataset expected = new PSDataset() { - TableName = tableName, + DatasetName = datasetName, DataFactoryName = DataFactoryName, ResourceGroupName = ResourceGroupName }; @@ -56,17 +56,17 @@ public void CanGetTable() dataFactoriesClientMock .Setup( c => - c.FilterPSTables( - It.Is( + c.FilterPSDatasets( + It.Is( options => options.ResourceGroupName == ResourceGroupName && options.DataFactoryName == DataFactoryName && - options.Name == tableName))) + options.Name == datasetName))) .CallBase() .Verifiable(); dataFactoriesClientMock - .Setup(c => c.GetTable(ResourceGroupName, DataFactoryName, tableName)) + .Setup(c => c.GetDataset(ResourceGroupName, DataFactoryName, datasetName)) .Returns(expected) .Verifiable(); @@ -77,7 +77,7 @@ public void CanGetTable() cmdlet.Name = ""; Exception empty = Assert.Throws(() => cmdlet.ExecuteCmdlet()); - cmdlet.Name = tableName; + cmdlet.Name = datasetName; cmdlet.ExecuteCmdlet(); // Assert @@ -89,20 +89,20 @@ public void CanGetTable() [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] - public void CanListTables() + public void CanListDatasets() { // Arrange - List expected = new List() + List expected = new List() { - new PSTable() + new PSDataset() { - TableName = tableName, + DatasetName = datasetName, DataFactoryName = DataFactoryName, ResourceGroupName = ResourceGroupName }, - new PSTable() + new PSDataset() { - TableName = "anotherTable", + DatasetName = "anotherDataset", DataFactoryName = DataFactoryName, ResourceGroupName = ResourceGroupName } @@ -111,8 +111,8 @@ public void CanListTables() dataFactoriesClientMock .Setup( c => - c.FilterPSTables( - It.Is( + c.FilterPSDatasets( + It.Is( options => options.ResourceGroupName == ResourceGroupName && options.DataFactoryName == DataFactoryName && @@ -122,7 +122,7 @@ public void CanListTables() .Verifiable(); dataFactoriesClientMock - .Setup(f => f.ListTables(It.Is( + .Setup(f => f.ListDatasets(It.Is( options => options.ResourceGroupName == ResourceGroupName && options.DataFactoryName == DataFactoryName && diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewTableTests.cs b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewDatasetTests.cs similarity index 79% rename from src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewTableTests.cs rename to src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewDatasetTests.cs index 906f2ba2d5c6..2a8a34d4a8e5 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewTableTests.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewDatasetTests.cs @@ -20,11 +20,11 @@ namespace Microsoft.Azure.Commands.DataFactories.Test.UnitTests { - public class NewTableTests : DataFactoryUnitTestBase + public class NewDatasetTests : DataFactoryUnitTestBase { - private const string tableName = "foo1"; + private const string datasetName = "foo1"; - private const string filePath = "table.json"; + private const string filePath = "dataset.json"; private const string rawJsonContent = @" { @@ -52,17 +52,17 @@ public class NewTableTests : DataFactoryUnitTestBase } "; - private NewAzureDataFactoryTableCommand cmdlet; + private NewAzureDataFactoryDatasetCommand cmdlet; - public NewTableTests() + public NewDatasetTests() { base.SetupTest(); - cmdlet = new NewAzureDataFactoryTableCommand() + cmdlet = new NewAzureDataFactoryDatasetCommand() { CommandRuntime = commandRuntimeMock.Object, DataFactoryClient = dataFactoriesClientMock.Object, - Name = tableName, + Name = datasetName, DataFactoryName = DataFactoryName, ResourceGroupName = ResourceGroupName }; @@ -71,12 +71,12 @@ public NewTableTests() // ToDo: enable the tests when we can set readonly provisioning state in test //[Fact] //[Trait(Category.AcceptanceType, Category.CheckIn)] - public void CanCreateTable() + public void CanCreateDataset() { // Arrange Table expected = new Table() { - Name = tableName, + Name = datasetName, Properties = new TableProperties() }; @@ -86,10 +86,10 @@ public void CanCreateTable() dataFactoriesClientMock.Setup( c => - c.CreatePSTable( - It.Is( + c.CreatePSDataset( + It.Is( parameters => - parameters.Name == tableName && + parameters.Name == datasetName && parameters.ResourceGroupName == ResourceGroupName && parameters.DataFactoryName == DataFactoryName))) .CallBase() @@ -97,7 +97,7 @@ public void CanCreateTable() dataFactoriesClientMock.Setup( c => - c.CreateOrUpdateTable(ResourceGroupName, DataFactoryName, tableName, rawJsonContent)) + c.CreateOrUpdateDataset(ResourceGroupName, DataFactoryName, datasetName, rawJsonContent)) .Returns(expected) .Verifiable(); @@ -112,22 +112,22 @@ public void CanCreateTable() commandRuntimeMock.Verify( f => f.WriteObject( - It.Is( + It.Is( tbl => ResourceGroupName == tbl.ResourceGroupName && DataFactoryName == tbl.DataFactoryName && - expected.Name == tbl.TableName)), + expected.Name == tbl.DatasetName)), Times.Once()); } [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] - public void CanThrowIfTableProvisioningFailed() + public void CanThrowIfDatasetProvisioningFailed() { // Arrange Table expected = new Table() { - Name = tableName, + Name = datasetName, Properties = new TableProperties() }; @@ -137,10 +137,10 @@ public void CanThrowIfTableProvisioningFailed() dataFactoriesClientMock.Setup( c => - c.CreatePSTable( - It.Is( + c.CreatePSDataset( + It.Is( parameters => - parameters.Name == tableName && + parameters.Name == datasetName && parameters.ResourceGroupName == ResourceGroupName && parameters.DataFactoryName == DataFactoryName))) .CallBase() @@ -148,7 +148,7 @@ public void CanThrowIfTableProvisioningFailed() dataFactoriesClientMock.Setup( c => - c.CreateOrUpdateTable(ResourceGroupName, DataFactoryName, tableName, rawJsonContent)) + c.CreateOrUpdateDataset(ResourceGroupName, DataFactoryName, datasetName, rawJsonContent)) .Returns(expected) .Verifiable(); diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/RemoveTableTests.cs b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/RemoveDatasetTests.cs similarity index 81% rename from src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/RemoveTableTests.cs rename to src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/RemoveDatasetTests.cs index 3e1eeca04607..d1d93ad910a3 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/RemoveTableTests.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/RemoveDatasetTests.cs @@ -19,21 +19,21 @@ namespace Microsoft.Azure.Commands.DataFactories.Test.UnitTests { - public class RemoveTableTests : DataFactoryUnitTestBase + public class RemoveDatasetTests : DataFactoryUnitTestBase { - private const string tableName = "foo"; + private const string datasetName = "foo"; - private RemoveAzureDataFactoryTableCommand cmdlet; + private RemoveAzureDataFactoryDatasetCommand cmdlet; - public RemoveTableTests() + public RemoveDatasetTests() { base.SetupTest(); - cmdlet = new RemoveAzureDataFactoryTableCommand() + cmdlet = new RemoveAzureDataFactoryDatasetCommand() { CommandRuntime = commandRuntimeMock.Object, DataFactoryClient = dataFactoriesClientMock.Object, - Name = tableName, + Name = datasetName, ResourceGroupName = ResourceGroupName, DataFactoryName = DataFactoryName, Force = true @@ -42,13 +42,13 @@ public RemoveTableTests() [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] - public void CanRemoveTable() + public void CanRemoveDataset() { HttpStatusCode expectedStatusCode = HttpStatusCode.OK; // Arrange dataFactoriesClientMock.Setup( - f => f.DeleteTable(ResourceGroupName, DataFactoryName, tableName)) + f => f.DeleteDataset(ResourceGroupName, DataFactoryName, datasetName)) .Returns(expectedStatusCode) .Verifiable(); diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config index b368bc842bac..0fa18d25f202 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config @@ -6,7 +6,7 @@ - + diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj index 5e291a8d30ef..b72d3acca109 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj @@ -62,8 +62,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll - False - ..\..\..\packages\Microsoft.Azure.Management.DataFactories.1.0.1\lib\net40\Microsoft.Azure.Management.DataFactories.dll + ..\..\..\packages\Microsoft.Azure.Management.DataFactories.1.0.2\lib\net45\Microsoft.Azure.Management.DataFactories.dll False @@ -159,7 +158,7 @@ - + @@ -190,7 +189,7 @@ - + @@ -204,10 +203,10 @@ True Resources.resx - - - - + + + + diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Constants.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Constants.cs index 2aadf582d145..eb5f06e311be 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Constants.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Constants.cs @@ -30,7 +30,7 @@ internal static class Constants public const string EncryptString = "AzureDataFactoryEncryptValue"; - public const string Table = "AzureDataFactoryTable"; + public const string Dataset = "AzureDataFactoryDataset"; public const string Pipeline = "AzureDataFactoryPipeline"; diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/DataSliceContextBaseCmdlet.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/DataSliceContextBaseCmdlet.cs index 983b33beb216..882f227f47ce 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/DataSliceContextBaseCmdlet.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/DataSliceContextBaseCmdlet.cs @@ -32,9 +32,9 @@ public abstract class DataSliceContextBaseCmdlet : DataFactoryBaseCmdlet public string DataFactoryName { get; set; } [Parameter(Position = 2, Mandatory = true, ValueFromPipelineByPropertyName = true, - HelpMessage = "The table name.")] + HelpMessage = "The dataset name.")] [ValidateNotNullOrEmpty] - public string TableName { get; set; } + public string DatasetName { get; set; } [Parameter(Position = 3, Mandatory = true, HelpMessage = "The data slice range start time.")] public DateTime StartDateTime { get; set; } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/GetAzureDataFactoryRunCommand.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/GetAzureDataFactoryRunCommand.cs index d2f995c80233..c7c56aa88409 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/GetAzureDataFactoryRunCommand.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/GetAzureDataFactoryRunCommand.cs @@ -36,9 +36,9 @@ public class GetAzureDataFactoryRunCommand : DataFactoryBaseCmdlet public string DataFactoryName { get; set; } [Parameter(Position = 2, Mandatory = true, ValueFromPipelineByPropertyName = true, - HelpMessage = "The table name.")] + HelpMessage = "The dataset name.")] [ValidateNotNullOrEmpty] - public string TableName { get; set; } + public string DatasetName { get; set; } [Parameter(Position = 3, Mandatory = true, HelpMessage = "The start time of the data slice queried.")] public DateTime StartDateTime { get; set; } @@ -61,7 +61,7 @@ public override void ExecuteCmdlet() { ResourceGroupName = ResourceGroupName, DataFactoryName = DataFactoryName, - TableName = TableName, + DatasetName = this.DatasetName, StartDateTime = StartDateTime }; diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/GetAzureDataFactorySliceCommand.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/GetAzureDataFactorySliceCommand.cs index e462c76f783c..3d013b2eb6e8 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/GetAzureDataFactorySliceCommand.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/GetAzureDataFactorySliceCommand.cs @@ -63,7 +63,7 @@ public override void ExecuteCmdlet() { ResourceGroupName = ResourceGroupName, DataFactoryName = DataFactoryName, - TableName = TableName, + DatasetName = this.DatasetName, DataSliceRangeStartTime = StartDateTime, DataSliceRangeEndTime = EndDateTime }; diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/SetAzureDataFactorySliceStatusCommand.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/SetAzureDataFactorySliceStatusCommand.cs index 1363b9442cd6..4b2087870c76 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/SetAzureDataFactorySliceStatusCommand.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/SetAzureDataFactorySliceStatusCommand.cs @@ -84,7 +84,7 @@ public override void ExecuteCmdlet() DataFactoryClient.SetSliceStatus( ResourceGroupName, DataFactoryName, - TableName, + this.DatasetName, Status, UpdateType, StartDateTime, diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Tables/TableContextBaseCmdlet.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Datasets/DatasetContextBaseCmdlet.cs similarity index 91% rename from src/ResourceManager/DataFactories/Commands.DataFactories/Tables/TableContextBaseCmdlet.cs rename to src/ResourceManager/DataFactories/Commands.DataFactories/Datasets/DatasetContextBaseCmdlet.cs index 807724f68431..27755e6c6d74 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Tables/TableContextBaseCmdlet.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Datasets/DatasetContextBaseCmdlet.cs @@ -17,7 +17,7 @@ namespace Microsoft.Azure.Commands.DataFactories { - public abstract class TableContextBaseCmdlet : DataFactoryBaseCmdlet + public abstract class DatasetContextBaseCmdlet : DataFactoryBaseCmdlet { [Parameter(ParameterSetName = ByFactoryObject, Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The data factory object.")] @@ -29,8 +29,8 @@ public abstract class TableContextBaseCmdlet : DataFactoryBaseCmdlet public string DataFactoryName { get; set; } [Parameter(Position = 2, Mandatory = true, ValueFromPipelineByPropertyName = true, - HelpMessage = "The table name.")] - [Alias("TableName")] + HelpMessage = "The dataset name.")] + [Alias("DatasetName")] [ValidateNotNullOrEmpty] public string Name { get; set; } } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Tables/GetAzureDataFactoryTableCommand.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Datasets/GetAzureDataFactoryDatasetCommand.cs similarity index 81% rename from src/ResourceManager/DataFactories/Commands.DataFactories/Tables/GetAzureDataFactoryTableCommand.cs rename to src/ResourceManager/DataFactories/Commands.DataFactories/Datasets/GetAzureDataFactoryDatasetCommand.cs index 2b59ec35c6b3..cecc213d5643 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Tables/GetAzureDataFactoryTableCommand.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Datasets/GetAzureDataFactoryDatasetCommand.cs @@ -22,8 +22,8 @@ namespace Microsoft.Azure.Commands.DataFactories { - [Cmdlet(VerbsCommon.Get, Constants.Table, DefaultParameterSetName = ByFactoryName), OutputType(typeof(List), typeof(PSTable))] - public class GetAzureDataFactoryTableCommand : DataFactoryBaseCmdlet + [Cmdlet(VerbsCommon.Get, Constants.Dataset, DefaultParameterSetName = ByFactoryName), OutputType(typeof(List), typeof(PSDataset))] + public class GetAzureDataFactoryDatasetCommand : DataFactoryBaseCmdlet { [Parameter(ParameterSetName = ByFactoryObject, Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The data factory object.")] @@ -35,7 +35,7 @@ public class GetAzureDataFactoryTableCommand : DataFactoryBaseCmdlet public string DataFactoryName { get; set; } [Parameter(Position = 2, Mandatory = false, ValueFromPipelineByPropertyName = true, - HelpMessage = "The table name.")] + HelpMessage = "The dataset name.")] public string Name { get; set; } [EnvironmentPermission(SecurityAction.Demand, Unrestricted = true)] @@ -58,7 +58,7 @@ public override void ExecuteCmdlet() ResourceGroupName = DataFactory.ResourceGroupName; } - TableFilterOptions filterOptions = new TableFilterOptions() + DatasetFilterOptions filterOptions = new DatasetFilterOptions() { Name = Name, ResourceGroupName = ResourceGroupName, @@ -67,18 +67,18 @@ public override void ExecuteCmdlet() if (Name != null) { - List tables = DataFactoryClient.FilterPSTables(filterOptions); - if (tables != null && tables.Any()) + List datasets = DataFactoryClient.FilterPSDatasets(filterOptions); + if (datasets != null && datasets.Any()) { - WriteObject(tables[0]); + WriteObject(datasets[0]); } return; } - // List tables until all pages are fetched + // List datasets until all pages are fetched do { - WriteObject(DataFactoryClient.FilterPSTables(filterOptions), true); + WriteObject(DataFactoryClient.FilterPSDatasets(filterOptions), true); } while (filterOptions.NextLink.IsNextPageLink()); } } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Tables/NewAzureDataFactoryTableCommand.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Datasets/NewAzureDataFactoryDatasetCommand.cs similarity index 86% rename from src/ResourceManager/DataFactories/Commands.DataFactories/Tables/NewAzureDataFactoryTableCommand.cs rename to src/ResourceManager/DataFactories/Commands.DataFactories/Datasets/NewAzureDataFactoryDatasetCommand.cs index 7190c51becc8..af21f8f3c7b4 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Tables/NewAzureDataFactoryTableCommand.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Datasets/NewAzureDataFactoryDatasetCommand.cs @@ -21,8 +21,8 @@ namespace Microsoft.Azure.Commands.DataFactories { - [Cmdlet(VerbsCommon.New, Constants.Table, DefaultParameterSetName = ByFactoryName), OutputType(typeof(PSTable))] - public class NewAzureDataFactoryTableCommand : DataFactoryBaseCmdlet + [Cmdlet(VerbsCommon.New, Constants.Dataset, DefaultParameterSetName = ByFactoryName), OutputType(typeof(PSDataset))] + public class NewAzureDataFactoryDatasetCommand : DataFactoryBaseCmdlet { [Parameter(ParameterSetName = ByFactoryObject, Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The data factory object.")] @@ -34,10 +34,10 @@ public class NewAzureDataFactoryTableCommand : DataFactoryBaseCmdlet public string DataFactoryName { get; set; } [Parameter(Position = 2, Mandatory = false, ValueFromPipelineByPropertyName = true, - HelpMessage = "The table name.")] + HelpMessage = "The dataset name.")] public string Name { get; set; } - [Parameter(Position = 3, Mandatory = true, HelpMessage = "The table JSON file path.")] + [Parameter(Position = 3, Mandatory = true, HelpMessage = "The dataset JSON file path.")] [ValidateNotNullOrEmpty] public string File { get; set; } @@ -62,9 +62,9 @@ public override void ExecuteCmdlet() string rawJsonContent = DataFactoryClient.ReadJsonFileContent(this.TryResolvePath(File)); // Resolve any mismatch between -Name and the name written in JSON - Name = ResolveResourceName(rawJsonContent, Name, "Table"); + Name = ResolveResourceName(rawJsonContent, Name, "Dataset"); - CreatePSTableParameters parameters = new CreatePSTableParameters() + CreatePSDatasetParameters parameters = new CreatePSDatasetParameters() { ResourceGroupName = ResourceGroupName, DataFactoryName = DataFactoryName, @@ -74,7 +74,7 @@ public override void ExecuteCmdlet() ConfirmAction = ConfirmAction }; - WriteObject(DataFactoryClient.CreatePSTable(parameters)); + WriteObject(DataFactoryClient.CreatePSDataset(parameters)); } } } \ No newline at end of file diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Tables/RemoveAzureDataFactoryTableCommand.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Datasets/RemoveAzureDataFactoryDatasetCommand.cs similarity index 83% rename from src/ResourceManager/DataFactories/Commands.DataFactories/Tables/RemoveAzureDataFactoryTableCommand.cs rename to src/ResourceManager/DataFactories/Commands.DataFactories/Datasets/RemoveAzureDataFactoryDatasetCommand.cs index d71f31680fe0..a23744b7e384 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Tables/RemoveAzureDataFactoryTableCommand.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Datasets/RemoveAzureDataFactoryDatasetCommand.cs @@ -20,8 +20,8 @@ namespace Microsoft.Azure.Commands.DataFactories { - [Cmdlet(VerbsCommon.Remove, Constants.Table, DefaultParameterSetName = ByFactoryName)] - public class RemoveAzureDataFactoryTableCommand : TableContextBaseCmdlet + [Cmdlet(VerbsCommon.Remove, Constants.Dataset, DefaultParameterSetName = ByFactoryName)] + public class RemoveAzureDataFactoryDatasetCommand : DatasetContextBaseCmdlet { [Parameter(Mandatory = false, HelpMessage = "Don't ask for confirmation.")] public SwitchParameter Force { get; set; } @@ -44,12 +44,12 @@ public override void ExecuteCmdlet() Force.IsPresent, string.Format( CultureInfo.InvariantCulture, - Resources.TableConfirmationMessage, + Resources.DatasetConfirmationMessage, Name, DataFactoryName), string.Format( CultureInfo.InvariantCulture, - Resources.TableRemoving, + Resources.DatasetRemoving, Name, DataFactoryName), Name, @@ -58,11 +58,11 @@ public override void ExecuteCmdlet() private void ExecuteDelete() { - HttpStatusCode response = DataFactoryClient.DeleteTable(ResourceGroupName, DataFactoryName, Name); + HttpStatusCode response = DataFactoryClient.DeleteDataset(ResourceGroupName, DataFactoryName, Name); if(response == HttpStatusCode.NoContent) { - WriteWarning(string.Format(CultureInfo.InvariantCulture, Resources.TableNotFound, Name, DataFactoryName)); + WriteWarning(string.Format(CultureInfo.InvariantCulture, Resources.DatasetNotFound, Name, DataFactoryName)); } } } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Microsoft.Azure.Commands.DataFactories.dll-Help.xml b/src/ResourceManager/DataFactories/Commands.DataFactories/Microsoft.Azure.Commands.DataFactories.dll-Help.xml index 1049f108e1b1..c81d99837a67 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Microsoft.Azure.Commands.DataFactories.dll-Help.xml +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Microsoft.Azure.Commands.DataFactories.dll-Help.xml @@ -774,7 +774,7 @@ The first command uses the Get-AzureDataFactory cmdlet to get the data factory named ContosoFactory, and then stores it in the $DataFactory variable. - The second command gets information about the linked service for the data factory stored in $DataFactory, and then passes that information to the Format-Table cmdlet by using the pipeline operator. The Format-Table cmdlet formats the output as a table with the specified properties as table columns. + The second command gets information about the linked service for the data factory stored in $DataFactory, and then passes that information to the Format-Table cmdlet by using the pipeline operator. The Format-Table cmdlet formats the output as a dataset with the specified properties as dataset columns. @@ -1100,7 +1100,7 @@ Get-AzureDataFactoryRun - Gets runs for a data slice of a table in Data Factory. + Gets runs for a data slice of a dataset in Data Factory. @@ -1110,13 +1110,13 @@ - The Get-AzureDataFactoryRun cmdlet gets the runs for a data slice of a table in Azure Data Factory. A table in a data factory is composed of slices over the time axis. The width of a slice is determined by the schedule, either hourly or daily. A run is a unit of processing for a slice. There could be one or more runs for a slice in case of retries or in case you rerun your slice due to failures. A slice is identified by its start time. To obtain the start time of a slice, use the Get-AzureDataFactorySlice cmdlet. + The Get-AzureDataFactoryRun cmdlet gets the runs for a data slice of a dataset in Azure Data Factory. A dataset in a data factory is composed of slices over the time axis. The width of a slice is determined by the schedule, either hourly or daily. A run is a unit of processing for a slice. There could be one or more runs for a slice in case of retries or in case you rerun your slice due to failures. A slice is identified by its start time. To obtain the start time of a slice, use the Get-AzureDataFactorySlice cmdlet. For example, to get a run for the following slice, use the start time 2015-04-02T20:00:00. ResourceGroupName : ADF DataFactoryName : SPDataFactory0924 - TableName : MarketingCampaignEffectivenessBlobTable + DatasetName : MarketingCampaignEffectivenessBlobDataset Start : 5/2/2014 8:00:00 PM End : 5/3/2014 8:00:00 PM RetryCount : 0 @@ -1143,9 +1143,9 @@ String - TableName + DatasetName - Specifies the name of the table. This cmdlet gets runs for slices that belong to the table that this parameter specifies. + Specifies the name of the dataset. This cmdlet gets runs for slices that belong to the dataset that this parameter specifies. String @@ -1170,9 +1170,9 @@ PSDataFactory - TableName + DatasetName - Specifies the name of the table. This cmdlet gets runs for slices that belong to the table that this parameter specifies. + Specifies the name of the dataset. This cmdlet gets runs for slices that belong to the dataset that this parameter specifies. String @@ -1241,9 +1241,9 @@ - TableName + DatasetName - Specifies the name of the table. This cmdlet gets runs for slices that belong to the table that this parameter specifies. + Specifies the name of the dataset. This cmdlet gets runs for slices that belong to the dataset that this parameter specifies. String @@ -1281,17 +1281,17 @@ - Example 1: Get a table + Example 1: Get a dataset - PS C:\> Get-AzureDataFactoryRun -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -TableName "DAWikiAggregatedData" -StartDateTime 2014-05-21T16:00:00Z + PS C:\> Get-AzureDataFactoryRun -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -DatasetName "DAWikiAggregatedData" -StartDateTime 2014-05-21T16:00:00Z Id : a7c4913c-9623-49b3-ae1e-3e45e2b68819 ResourceGroupName : ADF DataFactoryName : WikiADF - TableName : DAWikiAggregatedData + DatasetName : DAWikiAggregatedData PipelineName : 249ea141-ca00-8597-fad9-a148e5e7bdba ActivityId : fcefe2bd-39b1-2d7a-7b35-bcc2b0432300 ResumptionToken : a7c4913c-9623-49b3-ae1e-3e45e2b68819 @@ -1308,7 +1308,7 @@ ErrorMessage : - This command gets all runs for slices of the table named DAWikiAggregatedData in the data factory named WikiADF that start from 4 PM GMT on 05/21/2014. + This command gets all runs for slices of the dataset named DAWikiAggregatedData in the data factory named WikiADF that start from 4 PM GMT on 05/21/2014. @@ -1328,7 +1328,7 @@ Get-AzureDataFactorySlice - Gets data slices for a table in Data Factory. + Gets data slices for a dataset in Data Factory. @@ -1338,7 +1338,7 @@ - The Get-AzureDataFactorySlice cmdlet gets data slices for a table in Azure Data Factory. Specify a start time and an end time to define a range of data slices to view. + The Get-AzureDataFactorySlice cmdlet gets data slices for a dataset in Azure Data Factory. Specify a start time and an end time to define a range of data slices to view. The status of a data slice is one of the following values: @@ -1374,10 +1374,10 @@ String - TableName + DatasetName - Specifies the name of the table for which this cmdlet gets slices. + Specifies the name of the dataset for which this cmdlet gets slices. String @@ -1411,10 +1411,10 @@ PSDataFactory - TableName + DatasetName - Specifies the name of the table for which this cmdlet gets slices. + Specifies the name of the dataset for which this cmdlet gets slices. String @@ -1505,10 +1505,10 @@ - TableName + DatasetName - Specifies the name of the table for which this cmdlet gets slices. + Specifies the name of the dataset for which this cmdlet gets slices. String @@ -1547,16 +1547,16 @@ - Example 1: Get data slices for a table + Example 1: Get data slices for a dataset - PS C:\> Get-AzureDataFactorySlice -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -TableName "DAWikiAggregatedData" -StartDateTime 2014-05-20T10:00:00Z + PS C:\> Get-AzureDataFactorySlice -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -DatasetName "DAWikiAggregatedData" -StartDateTime 2014-05-20T10:00:00Z ResourceGroupName : ADF DataFactoryName : WikiADF - TableName : DAWikiAggregatedData + DatasetName : DAWikiAggregatedData Start : 5/21/2014 1:00:00 AM End : 5/21/2014 2:00:00 AM RetryCount : 0 @@ -1564,7 +1564,7 @@ ResourceGroupName : ADF DataFactoryName : WikiADF - TableName : DAWikiAggregatedData + DatasetName : DAWikiAggregatedData Start : 5/21/2014 2:00:00 AM End : 5/21/2014 3:00:00 AM RetryCount : 0 @@ -1574,7 +1574,7 @@ ResourceGroupName : ADF DataFactoryName : WikiADF - TableName : DAWikiAggregatedData + DatasetName : DAWikiAggregatedData Start : 5/21/2014 8:00:00 PM End : 5/21/2014 9:00:00 PM RetryCount : 0 @@ -1582,7 +1582,7 @@ ResourceGroupName : ADF DataFactoryName : WikiADF - TableName : DAWikiAggregatedData + DatasetName : DAWikiAggregatedData Start : 5/21/2014 9:00:00 PM End : 5/21/2014 10:00:00 PM RetryCount : 0 @@ -1592,7 +1592,7 @@ - This command gets all the data slices for the table named WikiAggregatedData in the data factory named WikiADF. The command gets slices produced after the time that the StartDateTime parameter specifies. The following example code sets the availability for this table every hour in the JavaScript Object Notation (JSON) file. + This command gets all the data slices for the dataset named WikiAggregatedData in the data factory named WikiADF. The command gets slices produced after the time that the StartDateTime parameter specifies. The following example code sets the availability for this dataset every hour in the JavaScript Object Notation (JSON) file. availability: { @@ -1626,59 +1626,59 @@ - Get-AzureDataFactoryTable + Get-AzureDataFactoryDataset - Gets information about tables in Data Factory. + Gets information about datasets in Data Factory. Get - AzureDataFactoryTable + AzureDataFactoryDataset - The Get-AzureDataFactoryTable cmdlet gets information about tables in Azure Data Factory. If you specify the name of a table, this cmdlet gets information about that table. If you do not specify a name, this cmdlet gets information about all the tables in the data factory. + The Get-AzureDataFactoryDataset cmdlet gets information about datasets in Azure Data Factory. If you specify the name of a dataset, this cmdlet gets information about that dataset. If you do not specify a name, this cmdlet gets information about all the datasets in the data factory. You must be in AzureResourceManager mode to run Azure Data Factory cmdlets. To switch to AzureResourceManager mode, type Switch-AzureMode AzureResourceManager. - Get-AzureDataFactoryTable + Get-AzureDataFactoryDataset ResourceGroupName - Specifies the name of an Azure resource group. This cmdlet gets tables that belong to the group that this parameter specifies. + Specifies the name of an Azure resource group. This cmdlet gets datasets that belong to the group that this parameter specifies. String DataFactoryName - Specifies the name of a data factory. This cmdlet gets tables that belong to the data factory that this parameter specifies. + Specifies the name of a data factory. This cmdlet gets datasets that belong to the data factory that this parameter specifies. String Name - Specifies the name of the table about which to get information. + Specifies the name of the dataset about which to get information. String - Get-AzureDataFactoryTable + Get-AzureDataFactoryDataset DataFactory - Specifies a PSDataFactory object. This cmdlet gets tables that belong to the data factory that this parameter specifies. + Specifies a PSDataFactory object. This cmdlet gets datasets that belong to the data factory that this parameter specifies. PSDataFactory Name - Specifies the name of the table about which to get information. + Specifies the name of the dataset about which to get information. String @@ -1688,7 +1688,7 @@ DataFactory - Specifies a PSDataFactory object. This cmdlet gets tables that belong to the data factory that this parameter specifies. + Specifies a PSDataFactory object. This cmdlet gets datasets that belong to the data factory that this parameter specifies. PSDataFactory @@ -1700,7 +1700,7 @@ DataFactoryName - Specifies the name of a data factory. This cmdlet gets tables that belong to the data factory that this parameter specifies. + Specifies the name of a data factory. This cmdlet gets datasets that belong to the data factory that this parameter specifies. String @@ -1712,7 +1712,7 @@ Name - Specifies the name of the table about which to get information. + Specifies the name of the dataset about which to get information. String @@ -1724,7 +1724,7 @@ ResourceGroupName - Specifies the name of an Azure resource group. This cmdlet gets tables that belong to the group that this parameter specifies. + Specifies the name of an Azure resource group. This cmdlet gets datasets that belong to the group that this parameter specifies. String @@ -1749,7 +1749,7 @@ - System.Collections.Generic.List`1[[Microsoft.WindowsAzure.Commands.Utilities.PSTable, Microsoft.WindowsAzure.Commands.Utilities, Version=0.8.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]] Microsoft.WindowsAzure.Commands.Utilities.PSTable + System.Collections.Generic.List`1[[Microsoft.WindowsAzure.Commands.Utilities.PSDataset, Microsoft.WindowsAzure.Commands.Utilities, Version=0.8.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35]] Microsoft.WindowsAzure.Commands.Utilities.PSDataset @@ -1762,13 +1762,13 @@ - Example 1: Get information about all tables + Example 1: Get information about all datasets - PS C:\> Get-AzureDataFactoryTable -ResourceGroupName "ADF" -DataFactoryName "WikiADF" - TableName : DACuratedWikiData + PS C:\> Get-AzureDataFactoryDataset -ResourceGroupName "ADF" -DataFactoryName "WikiADF" + DatasetName : DACuratedWikiData ResourceGroupName : ADF DataFactoryName : WikiADF Availability : Microsoft.DataFactories.Availability @@ -1777,7 +1777,7 @@ Structure : {} Published : False - TableName : DAWikipediaClickEvents + DatasetName : DAWikipediaClickEvents ResourceGroupName : ADF DataFactoryName : WikiADF Availability : Microsoft.DataFactories.Availability @@ -1786,7 +1786,7 @@ Structure : {} Published : False - TableName : DAWikiAggregatedData + DatasetName : DAWikiAggregatedData ResourceGroupName : ADF DataFactoryName : WikiADF Availability : Microsoft.DataFactories.Availability @@ -1796,7 +1796,7 @@ Published : False - This command gets information about all tables in the data factory named WikiADF. + This command gets information about all datasets in the data factory named WikiADF. @@ -1805,13 +1805,13 @@ - Example 2: Get information about a specific table + Example 2: Get information about a specific dataset - PS C:\> Get-AzureDataFactoryTable -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -Name "DAWikipediaClickEvents" - TableName : DAWikipediaClickEvents + PS C:\> Get-AzureDataFactoryDataset -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -Name "DAWikipediaClickEvents" + DatasetName : DAWikipediaClickEvents ResourceGroupName : ADF DataFactoryName : WikiADF Availability : Microsoft.DataFactories.Availability @@ -1821,7 +1821,7 @@ Published : False - This command gets information about the table named DAWikipediaClickEvents in the data factory named WikiADF. + This command gets information about the dataset named DAWikipediaClickEvents in the data factory named WikiADF. @@ -1830,12 +1830,12 @@ - Example 3: Get the location for a specific table + Example 3: Get the location for a specific dataset - PS C:\> (Get-AzureDataFactoryTable -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -Name "DAWikipediaClickEvents").Location + PS C:\> (Get-AzureDataFactoryDataset -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -Name "DAWikipediaClickEvents").Location BlobPath : wikidatagateway/wikisampledatain/ FilenamePrefix : Format : @@ -1843,7 +1843,7 @@ PartitionBy : {} - This command gets information for the table named DAWikipediaClickEvents in the data factory named WikiADF, and then uses standard dot notation to view the Location associated with that table. Alternatively, assign the output of the Get-AzureDataFactoryTable cmdlet to a variable, and then use dot notation to view the Location property associated with the table object stored in that variable. + This command gets information for the dataset named DAWikipediaClickEvents in the data factory named WikiADF, and then uses standard dot notation to view the Location associated with that dataset. Alternatively, assign the output of the Get-AzureDataFactoryDataset cmdlet to a variable, and then use dot notation to view the Location property associated with the dataset object stored in that variable. @@ -1854,11 +1854,11 @@ - New-AzureDataFactoryTable + New-AzureDataFactoryDataset - Remove-AzureDataFactoryTable + Remove-AzureDataFactoryDataset @@ -1883,7 +1883,7 @@ -- Create a data factory. -- Create linked services. - -- Create tables. + -- Create datasets. -- Create a pipeline. You must be in AzureResourceManager mode to run Azure Data Factory cmdlets. To switch to AzureResourceManager mode, type Switch-AzureMode AzureResourceManager. @@ -3143,7 +3143,7 @@ -- Create a data factory. -- Create linked services. - -- Create tables. + -- Create datasets. -- Create a pipeline. You must be in AzureResourceManager mode to run Azure Data Factory cmdlets. To switch to AzureResourceManager mode, type Switch-AzureMode AzureResourceManager. @@ -3375,7 +3375,7 @@ -- Create a data factory. -- Create linked services. - -- Create tables. + -- Create datasets. -- Create a pipeline. If a pipeline with the same name already exists in the data factory, this cmdlet prompts you to confirm whether to overwrite the existing pipeline with the new pipeline. If you confirm to overwrite the existing pipeline, the pipeline definition is also replaced. @@ -3608,95 +3608,95 @@ - New-AzureDataFactoryTable + New-AzureDataFactoryDataset - Creates a table in Data Factory. + Creates a dataset in Data Factory. New - AzureDataFactoryTable + AzureDataFactoryDataset - The New-AzureDataFactoryTable cmdlet creates a table in Azure Data Factory. If you specify a name for a table that already exists, this cmdlet prompts you for confirmation before it replaces the table. If you specify the Force parameter, the cmdlet replaces the existing table without confirmation. + The New-AzureDataFactoryDataset cmdlet creates a dataset in Azure Data Factory. If you specify a name for a dataset that already exists, this cmdlet prompts you for confirmation before it replaces the dataset. If you specify the Force parameter, the cmdlet replaces the existing dataset without confirmation. Perform these operations in the following order: -- Create a data factory. -- Create linked services. - -- Create tables. + -- Create datasets. -- Create a pipeline. - If a table with the same name already exists in the data factory, this cmdlet prompts you to confirm whether to overwrite the existing table with the new table. If you confirm to overwrite the existing table, the table definition is also replaced. + If a dataset with the same name already exists in the data factory, this cmdlet prompts you to confirm whether to overwrite the existing dataset with the new dataset. If you confirm to overwrite the existing dataset, the dataset definition is also replaced. You must be in AzureResourceManager mode to run Azure Data Factory cmdlets. To switch to AzureResourceManager mode, type Switch-AzureMode AzureResourceManager. - New-AzureDataFactoryTable + New-AzureDataFactoryDataset ResourceGroupName - Specifies the name of an Azure resource group. This cmdlet creates a table in the group that this parameter specifies. + Specifies the name of an Azure resource group. This cmdlet creates a dataset in the group that this parameter specifies. String DataFactoryName - Specifies the name of a data factory. This cmdlet creates a table in the data factory that this parameter specifies. + Specifies the name of a data factory. This cmdlet creates a dataset in the data factory that this parameter specifies. String Name - Specifies the name of the table to create. + Specifies the name of the dataset to create. String File - Specifies the full path of the JavaScript Object Notation (JSON) file that contains the description of the table. + Specifies the full path of the JavaScript Object Notation (JSON) file that contains the description of the dataset. String Force - Indicates that this cmdlet replaces an existing table without prompting you for confirmation. + Indicates that this cmdlet replaces an existing dataset without prompting you for confirmation. - New-AzureDataFactoryTable + New-AzureDataFactoryDataset DataFactory - Specifies a PSDataFactory object. This cmdlet creates a table in the data factory that this parameter specifies. + Specifies a PSDataFactory object. This cmdlet creates a dataset in the data factory that this parameter specifies. PSDataFactory Name - Specifies the name of the table to create. + Specifies the name of the dataset to create. String File - Specifies the full path of the JavaScript Object Notation (JSON) file that contains the description of the table. + Specifies the full path of the JavaScript Object Notation (JSON) file that contains the description of the dataset. String Force - Indicates that this cmdlet replaces an existing table without prompting you for confirmation. + Indicates that this cmdlet replaces an existing dataset without prompting you for confirmation. @@ -3705,7 +3705,7 @@ DataFactory - Specifies a PSDataFactory object. This cmdlet creates a table in the data factory that this parameter specifies. + Specifies a PSDataFactory object. This cmdlet creates a dataset in the data factory that this parameter specifies. PSDataFactory @@ -3717,7 +3717,7 @@ DataFactoryName - Specifies the name of a data factory. This cmdlet creates a table in the data factory that this parameter specifies. + Specifies the name of a data factory. This cmdlet creates a dataset in the data factory that this parameter specifies. String @@ -3729,7 +3729,7 @@ File - Specifies the full path of the JavaScript Object Notation (JSON) file that contains the description of the table. + Specifies the full path of the JavaScript Object Notation (JSON) file that contains the description of the dataset. String @@ -3741,7 +3741,7 @@ Force - Indicates that this cmdlet replaces an existing table without prompting you for confirmation. + Indicates that this cmdlet replaces an existing dataset without prompting you for confirmation. SwitchParameter @@ -3753,7 +3753,7 @@ Name - Specifies the name of the table to create. + Specifies the name of the dataset to create. String @@ -3765,7 +3765,7 @@ ResourceGroupName - Specifies the name of an Azure resource group. This cmdlet creates a table in the group that this parameter specifies. + Specifies the name of an Azure resource group. This cmdlet creates a dataset in the group that this parameter specifies. String @@ -3790,7 +3790,7 @@ - Microsoft.WindowsAzure.Commands.Utilities.PSTable + Microsoft.WindowsAzure.Commands.Utilities.PSDataset @@ -3803,13 +3803,13 @@ - Example 1: Create a table + Example 1: Create a dataset - PS C:\> New-AzureDataFactoryTable -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -Name "DAWikipediaClickEvents" -File "C:\\samples\\WikiSample\\DA_WikipediaClickEvents.json" - TableName : DAWikipediaClickEvents + PS C:\> New-AzureDataFactoryDataset -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -Name "DAWikipediaClickEvents" -File "C:\\samples\\WikiSample\\DA_WikipediaClickEvents.json" + DatasetName : DAWikipediaClickEvents ResourceGroupName : ADF DataFactoryName : WikiADF Availability : Microsoft.DataFactories.Availability @@ -3819,7 +3819,7 @@ Published : False - This command creates a table named DA_WikipediaClickEvents in the data factory named WikiADF. The command bases the table on information in the DAWikipediaClickEvents.json file. + This command creates a dataset named DA_WikipediaClickEvents in the data factory named WikiADF. The command bases the dataset on information in the DAWikipediaClickEvents.json file. @@ -3828,12 +3828,12 @@ - Example 2: View availability for a new table + Example 2: View availability for a new dataset - PS C:\> $Table = New-AzureDataFactoryTable -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -Name "DAWikipediaClickEvents" -File "C:\\samples\\WikiSample\\DA_WikipediaClickEvents.json"PS C:\> $Table.Availability + PS C:\> $Dataset = New-AzureDataFactoryDataset -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -Name "DAWikipediaClickEvents" -File "C:\\samples\\WikiSample\\DA_WikipediaClickEvents.json"PS C:\> $Dataset.Availability AnchorDateTime : Frequency : Hour Interval : 1 @@ -3841,8 +3841,8 @@ WaitOnExternal : Microsoft.DataFactories.WaitOnExternal - The first command creates a table named DA_WikipediaClickEvents, as in a previous example, and then assigns that table to the $Table variable. - The second command uses standard dot notation to display details about the Availability property of the table. + The first command creates a dataset named DA_WikipediaClickEvents, as in a previous example, and then assigns that dataset to the $Dataset variable. + The second command uses standard dot notation to display details about the Availability property of the dataset. @@ -3851,12 +3851,12 @@ - Example 3: View location for a new table + Example 3: View location for a new dataset - PS C:\> $Table = New-AzureDataFactoryTable -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -Name "DAWikipediaClickEvents" -File "C:\\samples\\WikiSample\\DA_WikipediaClickEvents.json"PS C:\> $Table.Location + PS C:\> $Dataset = New-AzureDataFactoryDataset -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -Name "DAWikipediaClickEvents" -File "C:\\samples\\WikiSample\\DA_WikipediaClickEvents.json"PS C:\> $Dataset.Location BlobPath : wikidatagateway/wikisampledatain/ FilenamePrefix : Format : @@ -3864,8 +3864,8 @@ PartitionBy : {} - The first command creates a table named DA_WikipediaClickEvents, as in a previous example, and then assigns that table to the $Table variable. - The second command displays details about the Location property of the table. + The first command creates a dataset named DA_WikipediaClickEvents, as in a previous example, and then assigns that dataset to the $Dataset variable. + The second command displays details about the Location property of the dataset. @@ -3874,12 +3874,12 @@ - Example 4: View validation rules for a new table + Example 4: View validation rules for a new dataset - PS C:\> $Table = New-AzureDataFactoryTable -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -Name "DAWikipediaClickEvents" -File "C:\\samples\\WikiSample\\DA_WikipediaClickEvents.json"PS C:\> $Table.Policy.Validation | Format-List $table.Location + PS C:\> $Dataset = New-AzureDataFactoryDataset -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -Name "DAWikipediaClickEvents" -File "C:\\samples\\WikiSample\\DA_WikipediaClickEvents.json"PS C:\> $Dataset.Policy.Validation | Format-List $dataset.Location BlobPath : wikidatagateway/wikisampledatain/ FilenamePrefix : @@ -3891,8 +3891,8 @@ MinimumSizeMB : 1 - The first command creates a table named DA_WikipediaClickEvents, as in a previous example, and then assigns that table to the $Table variable. - The second command gets details about the validation rules for the table, and then passes them to the Format-List cmdlet by using the pipeline operator. That Windows PowerShell cmdlet formats the results. For more information, type Get-Help Format-List. + The first command creates a dataset named DA_WikipediaClickEvents, as in a previous example, and then assigns that dataset to the $Dataset variable. + The second command gets details about the validation rules for the dataset, and then passes them to the Format-List cmdlet by using the pipeline operator. That Windows PowerShell cmdlet formats the results. For more information, type Get-Help Format-List. @@ -3903,11 +3903,11 @@ - Get-AzureDataFactoryTable + Get-AzureDataFactoryDataset - Remove-AzureDataFactoryTable + Remove-AzureDataFactoryDataset @@ -4889,72 +4889,72 @@ - Remove-AzureDataFactoryTable + Remove-AzureDataFactoryDataset - Removes a table from Data Factory. + Removes a dataset from Data Factory. Remove - AzureDataFactoryTable + AzureDataFactoryDataset - The Remove-AzureDataFactoryTable cmdlet removes a table from Azure Data Factory. + The Remove-AzureDataFactoryDataset cmdlet removes a dataset from Azure Data Factory. You must be in AzureResourceManager mode to run Azure Data Factory cmdlets. To switch to AzureResourceManager mode, type Switch-AzureMode AzureResourceManager. - Remove-AzureDataFactoryTable + Remove-AzureDataFactoryDataset ResourceGroupName - Specifies the name of an Azure resource group. This cmdlet removes a table from the group that this parameter specifies. + Specifies the name of an Azure resource group. This cmdlet removes a dataset from the group that this parameter specifies. String DataFactoryName - Specifies the name of a data factory. This cmdlet removes a table from the data factory that this parameter specifies. + Specifies the name of a data factory. This cmdlet removes a dataset from the data factory that this parameter specifies. String - + Name - Specifies the name of the table to remove. + Specifies the name of the dataset to remove. String Force - Indicates that this cmdlet removes a table without prompting you for confirmation. + Indicates that this cmdlet removes a dataset without prompting you for confirmation. - Remove-AzureDataFactoryTable + Remove-AzureDataFactoryDataset DataFactory - Specifies a PSDataFactory object. This cmdlet removes a table from the data factory that this parameter specifies. + Specifies a PSDataFactory object. This cmdlet removes a dataset from the data factory that this parameter specifies. PSDataFactory - + Name - Specifies the name of the table to remove. + Specifies the name of the dataset to remove. String Force - Indicates that this cmdlet removes a table without prompting you for confirmation. + Indicates that this cmdlet removes a dataset without prompting you for confirmation. @@ -4963,7 +4963,7 @@ DataFactory - Specifies a PSDataFactory object. This cmdlet removes a table from the data factory that this parameter specifies. + Specifies a PSDataFactory object. This cmdlet removes a dataset from the data factory that this parameter specifies. PSDataFactory @@ -4975,7 +4975,7 @@ DataFactoryName - Specifies the name of a data factory. This cmdlet removes a table from the data factory that this parameter specifies. + Specifies the name of a data factory. This cmdlet removes a dataset from the data factory that this parameter specifies. String @@ -4987,7 +4987,7 @@ Force - Indicates that this cmdlet removes a table without prompting you for confirmation. + Indicates that this cmdlet removes a dataset without prompting you for confirmation. SwitchParameter @@ -4996,10 +4996,10 @@ - + Name - Specifies the name of the table to remove. + Specifies the name of the dataset to remove. String @@ -5011,7 +5011,7 @@ ResourceGroupName - Specifies the name of an Azure resource group. This cmdlet removes a table from the group that this parameter specifies. + Specifies the name of an Azure resource group. This cmdlet removes a dataset from the group that this parameter specifies. String @@ -5049,19 +5049,19 @@ - Example 1: Remove a table + Example 1: Remove a dataset - PS C:\> Remove-AzureDataFactoryTable -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -Name "DAWikiAggregatedData" + PS C:\> Remove-AzureDataFactoryDataset -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -Name "DAWikiAggregatedData" Confirm - Are you sure you want to remove table 'DAWikiAggregatedData' in data factory 'WikiADF'? + Are you sure you want to remove dataset 'DAWikiAggregatedData' in data factory 'WikiADF'? [Y] Yes [N] No [S] Suspend [?] Help (default is "Y"): y True - This command removes the table named DAWikiAggregatedData from the data factory named WikiADF. The command returns a value of $True. + This command removes the dataset named DAWikiAggregatedData from the data factory named WikiADF. The command returns a value of $True. @@ -5072,11 +5072,11 @@ - Get-AzureDataFactoryTable + Get-AzureDataFactoryDataset - New-AzureDataFactoryTable + New-AzureDataFactoryDataset @@ -5787,8 +5787,8 @@ - The Set-AzureDataFactoryPipelineActivePeriod cmdlet configures the active period for the data slices that are processed by a pipeline in Azure Data Factory. If you use the Set-AzureDataFactorySliceStatus cmdlet to modify the status of slices for a table, make sure that the start time and end time for a slice are in the active period of the pipeline. - After you create a pipeline, you can specify the period in which data processing occurs. Specifying the active period for a pipeline defines the time duration in which the data slices are processed based on the Availability properties that were defined for each Data Factory table. + The Set-AzureDataFactoryPipelineActivePeriod cmdlet configures the active period for the data slices that are processed by a pipeline in Azure Data Factory. If you use the Set-AzureDataFactorySliceStatus cmdlet to modify the status of slices for a dataset, make sure that the start time and end time for a slice are in the active period of the pipeline. + After you create a pipeline, you can specify the period in which data processing occurs. Specifying the active period for a pipeline defines the time duration in which the data slices are processed based on the Availability properties that were defined for each Data Factory dataset. You must be in AzureResourceManager mode to run Azure Data Factory cmdlets. To switch to AzureResourceManager mode, type Switch-AzureMode AzureResourceManager. @@ -6090,7 +6090,7 @@ Set-AzureDataFactorySliceStatus - Sets the status of slices for a table in Data Factory. + Sets the status of slices for a dataset in Data Factory. @@ -6100,7 +6100,7 @@ - The Set-AzureDataFactorySliceStatus cmdlet sets the status of slices for a table in Azure Data Factory. + The Set-AzureDataFactorySliceStatus cmdlet sets the status of slices for a dataset in Azure Data Factory. You must be in AzureResourceManager mode to run Azure Data Factory cmdlets. To switch to AzureResourceManager mode, type Switch-AzureMode AzureResourceManager. @@ -6121,9 +6121,9 @@ String - TableName + DatasetName - Specifies the name of the table for which this cmdlet modifies slices. + Specifies the name of the dataset for which this cmdlet modifies slices. String @@ -6165,8 +6165,8 @@ Specifies the type of update to the slice. Valid values are: - -- Individual. Sets the status of each slice for the table in the specified time range. - -- UpstreamInPipeline. Sets the status of each slice for the table and all the dependent tables, which are used as input tables for activities in the pipeline. + -- Individual. Sets the status of each slice for the dataset in the specified time range. + -- UpstreamInPipeline. Sets the status of each slice for the dataset and all the dependent datasets, which are used as input datasets for activities in the pipeline. String @@ -6182,9 +6182,9 @@ PSDataFactory - TableName + DatasetName - Specifies the name of the table for which this cmdlet modifies slices. + Specifies the name of the dataset for which this cmdlet modifies slices. String @@ -6226,8 +6226,8 @@ Specifies the type of update to the slice. Valid values are: - -- Individual. Sets the status of each slice for the table in the specified time range. - -- UpstreamInPipeline. Sets the status of each slice for the table and all the dependent tables, which are used as input tables for activities in the pipeline. + -- Individual. Sets the status of each slice for the dataset in the specified time range. + -- UpstreamInPipeline. Sets the status of each slice for the dataset and all the dependent datasets, which are used as input datasets for activities in the pipeline. String @@ -6319,9 +6319,9 @@ - TableName + DatasetName - Specifies the name of the table for which this cmdlet modifies slices. + Specifies the name of the dataset for which this cmdlet modifies slices. String @@ -6336,8 +6336,8 @@ Specifies the type of update to the slice. Valid values are: - -- Individual. Sets the status of each slice for the table in the specified time range. - -- UpstreamInPipeline. Sets the status of each slice for the table and all the dependent tables, which are used as input tables for activities in the pipeline. + -- Individual. Sets the status of each slice for the dataset in the specified time range. + -- UpstreamInPipeline. Sets the status of each slice for the dataset and all the dependent datasets, which are used as input datasets for activities in the pipeline. String @@ -6381,11 +6381,11 @@ - PS C:\> Set-AzureDataFactorySliceStatus -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -TableName "DAWikiAggregatedData" -StartDateTime 2014-05-21T16:00:00Z -EndDateTime 2014-05-21T20:00:00Z -Status "PendingExecution" -UpdateType "UpstreamInPipeline" + PS C:\> Set-AzureDataFactorySliceStatus -ResourceGroupName "ADF" -DataFactoryName "WikiADF" -DatasetName "DAWikiAggregatedData" -StartDateTime 2014-05-21T16:00:00Z -EndDateTime 2014-05-21T20:00:00Z -Status "PendingExecution" -UpdateType "UpstreamInPipeline" True - This command sets the status of all slices for the table named DAWikiAggregatedData to PendingExecution in the data factory named WikiADF. The UpdateType parameter has a value of UpstreamInPipeline, and so the command sets the status of each slice for the table and all dependent tables. Dependent tables are used as input tables for activities in the pipeline. This command returns a value of $True. + This command sets the status of all slices for the dataset named DAWikiAggregatedData to PendingExecution in the data factory named WikiADF. The UpdateType parameter has a value of UpstreamInPipeline, and so the command sets the status of each slice for the dataset and all dependent datasets. Dependent datasets are used as input datasets for activities in the pipeline. This command returns a value of $True. diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Microsoft.Azure.Commands.DataFactories.format.ps1xml b/src/ResourceManager/DataFactories/Commands.DataFactories/Microsoft.Azure.Commands.DataFactories.format.ps1xml index 5f85dd744b4f..2490451643d9 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Microsoft.Azure.Commands.DataFactories.format.ps1xml +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Microsoft.Azure.Commands.DataFactories.format.ps1xml @@ -36,17 +36,17 @@ - Microsoft.Azure.Commands.DataFactories.Models.PSTable + Microsoft.Azure.Commands.DataFactories.Models.PSDataset - Microsoft.Azure.Commands.DataFactories.Models.PSTable + Microsoft.Azure.Commands.DataFactories.Models.PSDataset - - TableName + + DatasetName diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/CreatePSTableParameters.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/CreatePSTableParameters.cs index b6e71ad88331..53e86e408379 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/CreatePSTableParameters.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/CreatePSTableParameters.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Commands.DataFactories { - public class CreatePSTableParameters : DataFactoryParametersBase + public class CreatePSDatasetParameters : DataFactoryParametersBase { public string Name { get; set; } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.DataSlices.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.DataSlices.cs index 9be29c1384e4..d7ed89de52b8 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.DataSlices.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.DataSlices.cs @@ -41,7 +41,7 @@ public virtual List ListDataSliceRuns(DataSliceRunFilterOptions response = DataPipelineManagementClient.DataSliceRuns.List( filterOptions.ResourceGroupName, filterOptions.DataFactoryName, - filterOptions.TableName, + filterOptions.DatasetName, new DataSliceRunListParameters() { DataSliceStartTime = filterOptions.StartDateTime.ConvertToISO8601DateTimeString() @@ -58,7 +58,7 @@ public virtual List ListDataSliceRuns(DataSliceRunFilterOptions { ResourceGroupName = filterOptions.ResourceGroupName, DataFactoryName = filterOptions.DataFactoryName, - TableName = filterOptions.TableName + DatasetName = filterOptions.DatasetName }); } } @@ -80,7 +80,7 @@ public virtual List ListDataSlices(DataSliceFilterOptions filterOpt response = DataPipelineManagementClient.DataSlices.List( filterOptions.ResourceGroupName, filterOptions.DataFactoryName, - filterOptions.TableName, + filterOptions.DatasetName, new DataSliceListParameters() { DataSliceRangeStartTime = filterOptions.DataSliceRangeStartTime.ConvertToISO8601DateTimeString(), @@ -98,7 +98,7 @@ public virtual List ListDataSlices(DataSliceFilterOptions filterOpt { ResourceGroupName = filterOptions.ResourceGroupName, DataFactoryName = filterOptions.DataFactoryName, - TableName = filterOptions.TableName + DatasetName = filterOptions.DatasetName }); } } @@ -109,7 +109,7 @@ public virtual List ListDataSlices(DataSliceFilterOptions filterOpt public virtual void SetSliceStatus( string resourceGroupName, string dataFactoryName, - string tableName, + string datasetName, string sliceState, string updateType, DateTime dataSliceRangeStartTime, @@ -118,7 +118,7 @@ public virtual void SetSliceStatus( DataPipelineManagementClient.DataSlices.SetStatus( resourceGroupName, dataFactoryName, - tableName, + datasetName, new DataSliceSetStatusParameters() { SliceState = sliceState, diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Tables.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Datasets.cs similarity index 68% rename from src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Tables.cs rename to src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Datasets.cs index 7677d3bba6a5..fbf1b8546e29 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Tables.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Datasets.cs @@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.DataFactories { public partial class DataFactoryClient { - public virtual Table CreateOrUpdateTable(string resourceGroupName, string dataFactoryName, string tableName, string rawJsonContent) + public virtual Table CreateOrUpdateDataset(string resourceGroupName, string dataFactoryName, string datasetName, string rawJsonContent) { if (string.IsNullOrWhiteSpace(rawJsonContent)) { @@ -38,27 +38,27 @@ public virtual Table CreateOrUpdateTable(string resourceGroupName, string dataFa var response = DataPipelineManagementClient.Tables.CreateOrUpdateWithRawJsonContent( resourceGroupName, dataFactoryName, - tableName, + datasetName, new TableCreateOrUpdateWithRawJsonContentParameters() { Content = rawJsonContent }); return response.Table; } - public virtual PSTable GetTable(string resourceGroupName, string dataFactoryName, string tableName) + public virtual PSDataset GetDataset(string resourceGroupName, string dataFactoryName, string datasetName) { var response = DataPipelineManagementClient.Tables.Get( - resourceGroupName, dataFactoryName, tableName); + resourceGroupName, dataFactoryName, datasetName); - return new PSTable(response.Table) + return new PSDataset(response.Table) { ResourceGroupName = resourceGroupName, DataFactoryName = dataFactoryName }; } - public virtual List ListTables(TableFilterOptions filterOptions) + public virtual List ListDatasets(DatasetFilterOptions filterOptions) { - List tables = new List(); + List datasets = new List(); TableListResponse response; if (filterOptions.NextLink.IsNextPageLink()) @@ -73,10 +73,10 @@ public virtual List ListTables(TableFilterOptions filterOptions) if (response != null && response.Tables != null) { - foreach (var table in response.Tables) + foreach (var dataset in response.Tables) { - tables.Add( - new PSTable(table) + datasets.Add( + new PSDataset(dataset) { ResourceGroupName = filterOptions.ResourceGroupName, DataFactoryName = filterOptions.DataFactoryName @@ -84,16 +84,16 @@ public virtual List ListTables(TableFilterOptions filterOptions) } } - return tables; + return datasets; } - public virtual HttpStatusCode DeleteTable(string resourceGroupName, string dataFactoryName, string tableName) + public virtual HttpStatusCode DeleteDataset(string resourceGroupName, string dataFactoryName, string datasetName) { - AzureOperationResponse response = DataPipelineManagementClient.Tables.Delete(resourceGroupName, dataFactoryName, tableName); + AzureOperationResponse response = DataPipelineManagementClient.Tables.Delete(resourceGroupName, dataFactoryName, datasetName); return response.StatusCode; } - public virtual List FilterPSTables(TableFilterOptions filterOptions) + public virtual List FilterPSDatasets(DatasetFilterOptions filterOptions) { if (filterOptions == null) { @@ -105,32 +105,32 @@ public virtual List FilterPSTables(TableFilterOptions filterOptions) throw new ArgumentException(Resources.ResourceGroupNameCannotBeEmpty); } - List tables = new List(); + List datasets = new List(); if (!string.IsNullOrWhiteSpace(filterOptions.Name)) { - tables.Add(GetTable(filterOptions.ResourceGroupName, filterOptions.DataFactoryName, filterOptions.Name)); + datasets.Add(this.GetDataset(filterOptions.ResourceGroupName, filterOptions.DataFactoryName, filterOptions.Name)); } else { - tables.AddRange(ListTables(filterOptions)); + datasets.AddRange(this.ListDatasets(filterOptions)); } - return tables; + return datasets; } - public virtual PSTable CreatePSTable(CreatePSTableParameters parameters) + public virtual PSDataset CreatePSDataset(CreatePSDatasetParameters parameters) { if (parameters == null) { throw new ArgumentNullException("parameters"); } - PSTable table = null; - Action createTable = () => + PSDataset dataset = null; + Action createDataset = () => { - table = - new PSTable(CreateOrUpdateTable( + dataset = + new PSDataset(this.CreateOrUpdateDataset( parameters.ResourceGroupName, parameters.DataFactoryName, parameters.Name, @@ -140,50 +140,50 @@ public virtual PSTable CreatePSTable(CreatePSTableParameters parameters) DataFactoryName = parameters.DataFactoryName }; - if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(table.ProvisioningState)) + if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(dataset.ProvisioningState)) { - string errorMessage = table.Properties == null + string errorMessage = dataset.Properties == null ? string.Empty - : table.Properties.ErrorMessage; + : dataset.Properties.ErrorMessage; throw new ProvisioningFailedException(errorMessage); } }; if (parameters.Force) { - // If user decides to overwrite anyway, then there is no need to check if the table exists or not. - createTable(); + // If user decides to overwrite anyway, then there is no need to check if the dataset exists or not. + createDataset(); } else { - bool tableExists = CheckTableExists(parameters.ResourceGroupName, parameters.DataFactoryName, + bool datasetExists = this.CheckDatasetExists(parameters.ResourceGroupName, parameters.DataFactoryName, parameters.Name); parameters.ConfirmAction( - !tableExists, // prompt only if the table exists + !datasetExists, // prompt only if the dataset exists string.Format( CultureInfo.InvariantCulture, - Resources.TableExists, + Resources.DatasetExists, parameters.Name, parameters.DataFactoryName), string.Format( CultureInfo.InvariantCulture, - Resources.TableCreating, + Resources.DatasetCreating, parameters.Name, parameters.DataFactoryName), parameters.Name, - createTable); + createDataset); } - return table; + return dataset; } - private bool CheckTableExists(string resourceGroupName, string dataFactoryName, string tableName) + private bool CheckDatasetExists(string resourceGroupName, string dataFactoryName, string datasetName) { - // ToDo: implement HEAD to check if the table exists + // ToDo: implement HEAD to check if the dataset exists try { - PSTable table = GetTable(resourceGroupName, dataFactoryName, tableName); + PSDataset dataset = this.GetDataset(resourceGroupName, dataFactoryName, datasetName); return true; } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataSliceFilterOptions.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataSliceFilterOptions.cs index f9d0e994ad50..488e839c54b2 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataSliceFilterOptions.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataSliceFilterOptions.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Commands.DataFactories { public class DataSliceFilterOptions { - public string TableName { get; set; } + public string DatasetName { get; set; } public string ResourceGroupName { get; set; } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataSliceRunFilterOptions.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataSliceRunFilterOptions.cs index f6ac6eac63ee..545a1de13b22 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataSliceRunFilterOptions.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataSliceRunFilterOptions.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Commands.DataFactories { public class DataSliceRunFilterOptions { - public string TableName { get; set; } + public string DatasetName { get; set; } public string ResourceGroupName { get; set; } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataSlice.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataSlice.cs index dcbe0c76e670..752b418a2673 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataSlice.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataSlice.cs @@ -43,7 +43,7 @@ public PSDataSlice(DataSlice dataSlice) public string DataFactoryName { get; set; } - public string TableName { get; set; } + public string DatasetName { get; set; } public DateTime Start { diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataSliceRun.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataSliceRun.cs index 6d028e586976..2850dc71143e 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataSliceRun.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataSliceRun.cs @@ -56,7 +56,7 @@ internal set public string DataFactoryName { get; set; } - public string TableName { get; set; } + public string DatasetName { get; set; } public DateTime ProcessingStartTime { diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSTable.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataset.cs similarity index 65% rename from src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSTable.cs rename to src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataset.cs index e3798a009075..6c112d988fc4 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSTable.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataset.cs @@ -19,39 +19,39 @@ namespace Microsoft.Azure.Commands.DataFactories.Models { - public class PSTable + public class PSDataset { - private Table table; + private Table dataset; - public PSTable() + public PSDataset() { - table = new Table() {Properties = new TableProperties()}; + this.dataset = new Table() {Properties = new TableProperties()}; } - public PSTable(Table table) + public PSDataset(Table dataset) { - if (table == null) + if (dataset == null) { - throw new ArgumentNullException("table"); + throw new ArgumentNullException("dataset"); } - if (table.Properties == null) + if (dataset.Properties == null) { - table.Properties = new TableProperties(); + dataset.Properties = new TableProperties(); } - this.table = table; + this.dataset = dataset; } - public string TableName + public string DatasetName { get { - return table.Name; + return this.dataset.Name; } set { - table.Name = value; + this.dataset.Name = value; } } @@ -63,11 +63,11 @@ public Availability Availability { get { - return table.Properties.Availability; + return this.dataset.Properties.Availability; } set { - table.Properties.Availability = value; + this.dataset.Properties.Availability = value; } } @@ -75,11 +75,11 @@ public TableTypeProperties Location { get { - return table.Properties.TypeProperties; + return this.dataset.Properties.TypeProperties; } set { - table.Properties.TypeProperties = value; + this.dataset.Properties.TypeProperties = value; } } @@ -87,11 +87,11 @@ public Policy Policy { get { - return table.Properties.Policy; + return this.dataset.Properties.Policy; } set { - table.Properties.Policy = value; + this.dataset.Properties.Policy = value; } } @@ -99,11 +99,11 @@ public IList Structure { get { - return table.Properties.Structure; + return this.dataset.Properties.Structure; } set { - table.Properties.Structure = value; + this.dataset.Properties.Structure = value; } } @@ -111,11 +111,11 @@ public bool? Published { get { - return table.Properties.Published; + return this.dataset.Properties.Published; } set { - table.Properties.Published = value; + this.dataset.Properties.Published = value; } } @@ -123,11 +123,11 @@ public TableProperties Properties { get { - return table.Properties; + return this.dataset.Properties; } set { - table.Properties = value; + this.dataset.Properties = value; } } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/TableFilterOptions.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/TableFilterOptions.cs index aca5e6f50af4..53278bf3b507 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/TableFilterOptions.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/TableFilterOptions.cs @@ -14,7 +14,7 @@ namespace Microsoft.Azure.Commands.DataFactories { - public class TableFilterOptions + public class DatasetFilterOptions { public string Name { get; set; } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Properties/Resources.Designer.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Properties/Resources.Designer.cs index 6a80eaa0de94..89515c7d0ef0 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Properties/Resources.Designer.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -143,6 +143,53 @@ internal static string DataFactoryRemoving { } } + /// + /// Looks up a localized string similar to Are you sure you want to remove dataset '{0}' in data factory '{1}'?. + /// + internal static string DatasetConfirmationMessage { + get { + return ResourceManager.GetString("DatasetConfirmationMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Creating dataset '{0}' in data factory '{1}'.. + /// + internal static string DatasetCreating { + get { + return ResourceManager.GetString("DatasetCreating", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A dataset with the name {0} in the data factory {1} already exists. + ///Continuing execution will overwrite the exisiting one. + ///Are you sure you want to continue?. + /// + internal static string DatasetExists { + get { + return ResourceManager.GetString("DatasetExists", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Dataset '{0}' does not exist in data factory '{1}'.. + /// + internal static string DatasetNotFound { + get { + return ResourceManager.GetString("DatasetNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing dataset '{0}' in data factory '{1}'.. + /// + internal static string DatasetRemoving { + get { + return ResourceManager.GetString("DatasetRemoving", resourceCulture); + } + } + /// /// Looks up a localized string similar to The argument set for download method is incomplete.. /// @@ -414,52 +461,5 @@ internal static string ResourceGroupNameCannotBeEmpty { return ResourceManager.GetString("ResourceGroupNameCannotBeEmpty", resourceCulture); } } - - /// - /// Looks up a localized string similar to Are you sure you want to remove table '{0}' in data factory '{1}'?. - /// - internal static string TableConfirmationMessage { - get { - return ResourceManager.GetString("TableConfirmationMessage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Creating table '{0}' in data factory '{1}'.. - /// - internal static string TableCreating { - get { - return ResourceManager.GetString("TableCreating", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to A table with the name {0} in the data factory {1} already exists. - ///Continuing execution will overwrite the exisiting one. - ///Are you sure you want to continue?. - /// - internal static string TableExists { - get { - return ResourceManager.GetString("TableExists", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Table '{0}' does not exist in data factory '{1}'.. - /// - internal static string TableNotFound { - get { - return ResourceManager.GetString("TableNotFound", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Removing table '{0}' in data factory '{1}'.. - /// - internal static string TableRemoving { - get { - return ResourceManager.GetString("TableRemoving", resourceCulture); - } - } } } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Properties/Resources.resx b/src/ResourceManager/DataFactories/Commands.DataFactories/Properties/Resources.resx index 708211898133..3c2635950062 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Properties/Resources.resx +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Properties/Resources.resx @@ -225,22 +225,22 @@ Are you sure you want to continue? Resource group name cannot be null. - - Are you sure you want to remove table '{0}' in data factory '{1}'? + + Are you sure you want to remove dataset '{0}' in data factory '{1}'? - - Creating table '{0}' in data factory '{1}'. + + Creating dataset '{0}' in data factory '{1}'. - - A table with the name {0} in the data factory {1} already exists. + + A dataset with the name {0} in the data factory {1} already exists. Continuing execution will overwrite the exisiting one. Are you sure you want to continue? - - Table '{0}' does not exist in data factory '{1}'. + + Dataset '{0}' does not exist in data factory '{1}'. - - Removing table '{0}' in data factory '{1}'. + + Removing dataset '{0}' in data factory '{1}'. No Slices were found in the time range specified. diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config b/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config index 42e0ca391d99..408a7e130b4e 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config @@ -4,7 +4,7 @@ - +