Skip to content

. #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jan 7, 2016
Merged

. #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4deecad
Merge branch 'dev' of https://github.com/Azure/azure-powershell.git i…
brooklyngw Jun 9, 2015
6ff43ea
Merge branch 'dev' of https://github.com/Azure/azure-powershell.git i…
brooklyngw Jun 22, 2015
d3c18af
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Dec 18, 2015
df8be98
Updated ExpressRoute commandlets to latest package
Dec 22, 2015
df26274
Merge branch 'dev' of https://github.com/Azure/azure-powershell.git i…
Dec 22, 2015
d9d0ba7
Updated to latest ExpressRoute package
Dec 23, 2015
e70f57e
Merge branch 'dev' of https://github.com/Azure/azure-powershell.git i…
Dec 23, 2015
aa88e5b
Add Function support to Azure Stream Analytics PowerShell
atpham256 Jan 7, 2016
c91d4c7
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
atpham256 Jan 7, 2016
f540e6c
Changed billingType to BillingType parameter. Also modified tests for…
Jan 7, 2016
b2799dc
Merge branch 'dev' of https://github.com/Azure/azure-powershell.git i…
Jan 7, 2016
52e2c12
Merge pull request #1595 from atpham256/dev
stankovski Jan 7, 2016
4709e15
update certificate
yugangw-msft Jan 7, 2016
8b0a715
Merge pull request #1601 from yugangw-msft/402
Jan 7, 2016
1fbae63
Merge pull request #1538 from nupurkot/dev
Jan 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
UnsignedFiles="@(DelaySignedAssembliesToSign)"
DestinationPath="$(LibrarySourceFolder)\Package\$(Configuration)"
BasePath="$(LibrarySourceFolder)\Package\$(Configuration)"
Certificates="72, 10006"
Certificates="72, 401"
SigningLogPath="$(LibraryRoot)\signing.log"
ToolsPath="$(CIToolsPath)"
Condition="!$(DelaySign) and '@(DelaySignedAssembliesToSign)' != ''"/>
Expand All @@ -230,7 +230,7 @@
UnsignedFiles="@(ScriptsToSign)"
DestinationPath="$(LibrarySourceFolder)\Package\$(Configuration)"
BasePath="$(LibrarySourceFolder)\Package\$(Configuration)"
Certificates="10006"
Certificates="402"
SigningLogPath="$(LibraryRoot)\signing-scripts.log"
ToolsPath="$(CIToolsPath)"
Condition="!$(DelaySign) and '@(ScriptsToSign)' != ''"/>
Expand Down Expand Up @@ -272,7 +272,7 @@
UnsignedFiles="@(InstallersToSign)"
DestinationPath="$(LibraryRoot)\signed"
SigningLogPath="$(LibraryRoot)\msi-signing.log"
Certificates="10006"
Certificates="402"
ToolsPath="$(CIToolsPath)"
Condition="!$(DelaySign) and '@(InstallersToSign)' != ''"/>

Expand Down
8 changes: 7 additions & 1 deletion ...anager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.StreamAnalytics">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.StreamAnalytics.1.7.1\lib\net40\Microsoft.Azure.Management.StreamAnalytics.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.StreamAnalytics.1.7.3\lib\net40\Microsoft.Azure.Management.StreamAnalytics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down Expand Up @@ -197,6 +197,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="Resources\Function.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Resources\Job.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand All @@ -206,6 +209,9 @@
<None Include="Resources\Output.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Resources\RetrieveDefaultFunctionDefinitionRequest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Resources\Transformation.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
41 changes: 41 additions & 0 deletions src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Resources/Function.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"name": "scoreTweet",
"properties": {
"type": "Scalar",
"properties": {
"inputs": [
{
"dataType": "nvarchar(max)",
"isConfigurationParameter": false
}
],
"output": {
"dataType": "nvarchar(max)"
},
"binding": {
"type": "Microsoft.MachineLearning/WebService",
"properties": {
"endpoint": "https://ussouthcentral.services.azureml.net/workspaces/f80d5d7a77fa4a46bf2a30c63c078dca/services/b7be5e40fd194258896fb602c1858eaf/execute?api-version=2.0&details=true",
"apiKey": "$EncryptedStringForTesting",
"inputs": {
"name": "input1",
"columnNames": [
{
"name": "tweet",
"dataType": "String",
"mapTo": 0
}
]
},
"outputs": [
{
"name": "Sentiment",
"dataType": "String"
}
],
"batchSize": 10
}
}
}
}
}
149 changes: 96 additions & 53 deletions src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Resources/Job.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,104 @@
{
"location": "West US",
"tags": { "key": "value" },
"location": "West US",
"tags": { "key": "value" },

"properties": {
"sku": {
"name": "standard"
},
"inputs": [
{
"name": "Input",
"properties": {
"type": "stream",
"serialization": {
"type": "JSON",
"properties": {
"encoding": "UTF8"
"properties": {
"sku": {
"name": "standard"
},
"inputs": [
{
"name": "Input",
"properties": {
"type": "stream",
"serialization": {
"type": "JSON",
"properties": {
"encoding": "UTF8"
}
},
"datasource": {
"type": "Microsoft.Storage/Blob",
"properties": {
"storageAccounts": [
{
"accountName": "azurenrtdogfood",
"accountKey": "$EncryptedStringForTesting"
}
],
"container": "samples",
"pathPattern": ""
}
}
}
}
},
"datasource": {
"type": "Microsoft.Storage/Blob",
],
"transformation": {
"name": "transform1",
"properties": {
"storageAccounts" : [
{
"accountName": "azurenrtdogfood",
"accountKey": "$EncryptedStringForTesting"
"streamingUnits": 1,
"query": "select Id, Name from Input"
}
},
"outputs": [
{
"name": "Output",
"properties": {
"datasource": {
"type": "Microsoft.Sql/Server/Database",
"properties": {
"server": "$EncryptedStringForTesting.database.windows.net",
"database": "azurenrtsql",
"user": "azurenrt@$EncryptedStringForTesting",
"password": "$EncryptedStringForTesting",
"table": "Samples"
}
}
}
],
"container": "samples",
"pathPattern": ""
}
}
}
}
],
"transformation": {
"name": "transform1",
"properties": {
"streamingUnits": 1,
"query": "select Id, Name from Input"
}
},
"outputs": [
{
"name": "Output",
"properties": {
"datasource": {
"type": "Microsoft.Sql/Server/Database",
"properties": {
"server": "$EncryptedStringForTesting.database.windows.net",
"database": "azurenrtsql",
"user": "azurenrt@$EncryptedStringForTesting",
"password": "$EncryptedStringForTesting",
"table": "Samples"
],
"functions": [
{
"name": "scoreTweet",
"properties": {
"type": "Scalar",
"properties": {
"inputs": [
{
"dataType": "nvarchar(max)",
"isConfigurationParameter": false
}
],
"output": {
"dataType": "nvarchar(max)"
},
"binding": {
"type": "Microsoft.MachineLearning/WebService",
"properties": {
"endpoint": "https://ussouthcentral.services.azureml.net/workspaces/f80d5d7a77fa4a46bf2a30c63c078dca/services/b7be5e40fd194258896fb602c1858eaf/execute?api-version=2.0&details=true",
"apiKey": "$EncryptedStringForTesting",
"inputs": {
"name": "input1",
"columnNames": [
{
"name": "tweet",
"dataType": "String",
"mapTo": 0
}
]
},
"outputs": [
{
"name": "Sentiment",
"dataType": "String"
}
],
"batchSize": 10
}
}
}
}
}
}
}
}
]
}
]
}
}
8 changes: 8 additions & 0 deletions ...ics/Commands.StreamAnalytics.Test/Resources/RetrieveDefaultFunctionDefinitionRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"bindingType": "Microsoft.MachineLearning/WebService",
"bindingRetrievalProperties": {
"executeEndpoint": "https://ussouthcentral.services.azureml.net/workspaces/f80d5d7a77fa4a46bf2a30c63c078dca/services/b7be5e40fd194258896fb602c1858eaf/execute?api-version=2.0&details=true",
"udfType": "Scalar"
}
}

23 changes: 23 additions & 0 deletions ...urceManager/StreamAnalytics/Commands.StreamAnalytics.Test/ScenarioTests/EndToEndTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ function Test-TestStreamingAnalyticsE2E
$inputName = "Input"
$outputName = "Output"
$transformationName = "transform1"
$functionName = "scoreTweet"

# Create Job
$actual = New-AzureRmStreamAnalyticsJob -File .\Resources\job.json -ResourceGroupName $resourceGroup -Name $jobName -Force
Expand All @@ -41,6 +42,10 @@ function Test-TestStreamingAnalyticsE2E
$actual = Get-AzureRmStreamAnalyticsTransformation -JobName $jobName -Name $transformationName -ResourceGroupName $resourceGroup
Assert-AreEqual $transformationName $actual.Name

# Get Job function
$actual = Get-AzureRmStreamAnalyticsFunction -JobName $jobName -Name $functionName -ResourceGroupName $resourceGroup
Assert-AreEqual $functionName $actual.Name

# New Input (Patch)
$actual = New-AzureRmStreamAnalyticsInput -File .\Resources\Input.json -JobName $jobName -ResourceGroupName $resourceGroup -Force
Assert-AreEqual $inputName $actual.Name
Expand All @@ -63,6 +68,15 @@ function Test-TestStreamingAnalyticsE2E
$actual = New-AzureRmStreamAnalyticsTransformation -File .\Resources\Transformation.json -JobName $jobName -ResourceGroupName $resourceGroup -Force
Assert-AreEqual $transformationName $actual.Name

# New Function (Patch)
$actual = New-AzureRmStreamAnalyticsFunction -File .\Resources\Function.json -JobName $jobName -ResourceGroupName $resourceGroup -Force
Assert-AreEqual $functionName $actual.Name

# Test Function
$actual = Test-AzureRmStreamAnalyticsFunction -JobName $jobName -Name $functionName -ResourceGroupName $resourceGroup
$expected = "True"
Assert-AreEqual $expected $actual

# Get Quota
$actual = Get-AzureRmStreamAnalyticsQuota -Location "West US"
$expected = 0
Expand Down Expand Up @@ -90,6 +104,15 @@ function Test-TestStreamingAnalyticsE2E
$expected = "True"
Assert-AreEqual $expected $actual

# Get Function Default Definition
$actual = Get-AzureRmStreamAnalyticsDefaultFunctionDefinition -File .\Resources\RetrieveDefaultFunctionDefinitionRequest.json -Name $functionName -JobName $jobName -ResourceGroupName $resourceGroup
Assert-AreEqual $functionName $actual.Name

# Remove Function
$actual = Remove-AzureRmStreamAnalyticsFunction -JobName $jobName -Name $functionName -ResourceGroupName $resourceGroup -Force
$expected = "True"
Assert-AreEqual $expected $actual

# Remove Output
$actual = Remove-AzureRmStreamAnalyticsOutput -JobName $jobName -Name Output -ResourceGroupName $resourceGroup -Force
$expected = "True"
Expand Down
Loading