Merge pull request #11 from Microsoft/develop

Develop

Powershell/Deploy-WTTAzureDWDatabase.ps1

@@ -123,41 +123,6 @@ function Deploy-WTTAzureDWDatabase
 
                     # Create database using 2000 units
 					WriteLabel("Creating database '$DWDatabaseName'")
-<<<<<<< HEAD
-					$azureDWExist = New-AzureRMSqlDatabase -RequestedServiceObjectiveName "DW2000" -ServerName $ServerName -DatabaseName $DWDatabaseName -Edition $DatabaseEdition -ResourceGroupName $WTTEnvironmentApplicationName -Verbose:$false
-                    if(!$azureDWExist)
-                    {
-					    WriteValue("Unsuccessful")
-                    }
-                    else
-                    {
-                        WriteValue("Successful")
-                    }
-
-					$DWServer = (Find-AzureRmResource -ResourceType "Microsoft.Sql/servers" -ResourceNameContains "primary" -ExpandProperties).properties.FullyQualifiedDomainName
-					# Set working location
-					Push-Location -StackName wtt
-					# Create Database tables
-					ForEach($file in Get-ChildItem ".\Scripts\Datawarehouse" -Filter *.sql)
-					{
-						WriteLabel("Executing Script '$file'")
-						$result = Invoke-Sqlcmd -Username "$UserName@$ServerName" -Password $Password -ServerInstance $DWServer -Database $DWDatabaseName -InputFile ".\Scripts\Datawarehouse\$file" -QueryTimeout 0
-						WriteValue("Successful")
-					}
-
-					# Set working location
-					Pop-Location -StackName wtt
-
-					# Downgrade to 400 units
-					WriteLabel("Downgrading DataWarehouse database to 400 Units")
-					$null = Set-AzureRmSqlDatabase -RequestedServiceObjectiveName "DW400" -ServerName $ServerName -DatabaseName $DWDatabaseName -ResourceGroupName $WTTEnvironmentApplicationName
-					WriteValue("Successful")
-
-					WriteLabel("Pausing DataWarehouse database")
-					$null = Suspend-AzureRMSqlDatabase –ResourceGroupName $WTTEnvironmentApplicationName –ServerName $ServerName –DatabaseName $DWDatabaseName
-					WriteValue("Successful")
-					Start-Sleep -s 180
-=======
 
                     $dwExist = $false
                     Do
@@ -208,7 +173,6 @@ function Deploy-WTTAzureDWDatabase
 		    			WriteValue("Successful")
 			    		Start-Sleep -s 180
                     }
->>>>>>> develop
 				}
 			}
 			Catch

Powershell/New-WTTADFEnvironment.ps1

@@ -121,34 +121,21 @@ function GetStorageAccountKey()
 
 function CreateStorageContainer($storageAccountKey)
 {
-<<<<<<< HEAD
-=======
         WriteLabel("Creating Storage Container")
->>>>>>> develop
         try{
             # Get Context
             $context = New-AzureStorageContext -storageAccountName $ApplicationName -StorageAccountKey $storageAccountKey
 
             # Create the container to store blob
-<<<<<<< HEAD
-            $container = New-AzureStorageContainer -Name 'productrec' -Context $context -ErrorAction Stop        
-=======
             $container = New-AzureStorageContainer -Name 'productrec' -Context $context -ErrorAction Stop
             WriteValue("Successful")      
->>>>>>> develop
         }catch{
             if($error[0].CategoryInfo.Category -eq 'ResourceExists'){
                 Write-Host 'resource exists.'
             }else{
                 Write-Host 'error.'
             }
-<<<<<<< HEAD
-        }
-        Write-Host 'created.'
-
-=======
         }       
->>>>>>> develop
 }
 
 function SetupMappingDictionary($StorageAccountKey)

README.md

@@ -3,3 +3,5 @@ Azure SQL Database WingTipTickets demo and hands on lab
 These files comprise a hands-on-lab that demostrates an Azure SQL Database and Azure Search based sample application used to selling concert tickets
 There are two Word documents, one that describes that HOL setup, and another that describes all of the scenarios that can be used
 Source-code for the application is also available in the sourcecode sub-directory
+
+This is the Development Branch of WingTipTickets