Merge pull request #18 from mspnp/roshar/bb-scenarios

moved scenarios out of the buildingblocks and added a driver template…

drivers/bash/deploy-template-with-param.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-usage(){
-  echo "Invalid option: -$OPTARG"
-  echo "Usage: deploy-template-with-param -n [Resource group name]"
-  echo "                                  -l [Resource group location]"
-  echo "                                  -t [Template file]"
-  echo "                                  -p [Template parameters file]"
-  exit 1
-}
-
-while getopts ":n:l:f:e:c:" opt; do
-  case $opt in
-    n)GROUP_NAME=$OPTARG;;
-    l)LOCATION=$OPTARG;;
-    f)TEMPLATE=$OPTARG;;
-    e)PARAMETERS=$OPTARG;;
-    *)usage;;
-  esac
-done
-
-cat $PARAMETERS | tr '\n' ' ' | sed "s/\"customData[^{]*{[^}]*}/$(sed 's:/:\\/:g' updatepattern.txt)/" > parms.json
-
-azure config mode arm
-azure group create -n "$GROUP_NAME" -l "$LOCATION" -f $TEMPLATE -e ./parms.json  -v
-
-rm parms.json

drivers/json/deploy-template-return-outputs.json

@@ -1,67 +0,0 @@
-{
-  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    "templateFileUri": {
-      "type": "string",
-      "minLength": 1,
-      "metadata": {
-        "description": "Template file to deploy."
-      }
-    },
-    "templateParamUri": {
-      "type": "string",
-      "minLength": 1,
-      "metadata": {
-        "description": "Template parameters file to deploy alowgwith the template."
-      }
-    }
-  },
-  "variables": {
-    "templateParts": "[split(parameters('templateParamUri'),'/')]",
-    "templateDescription": "[variables('templateParts')[sub(length(variables('templateParts')), 1)]]",
-    "collectorTemplate": "[uri(deployment().properties.templateLink.uri, '../../Templates/resources/common/collector.json')]"
-
-  },
-  "resources": [
-    {
-      "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2016-02-01",
-      "name": "[concat('deploy-', variables('templateDescription'))]",
-      "properties": {
-        "mode": "Incremental",
-        "templateLink": {
-          "uri": "[parameters('templateFileUri')]",
-          "contentVersion": "1.0.0.0"
-        },
-        "parametersLink": {
-          "uri": "[parameters('templateParamUri')]",
-          "contentVersion": "1.0.0.0"
-        }
-      }
-    },
-    {
-      "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2016-02-01",
-      "name": "[concat('output-', variables('templateDescription'))]",
-      "properties": {
-        "mode": "Incremental",
-        "templateLink": {
-          "uri": "[variables('collectorTemplate')]",
-        },
-        "parameters": {
-          "deploymentContext": {
-            "value": {
-              "parentTemplateUniqueString": "output"
-            }
-          },
-          "source": { "value": "[reference(concat('deploy-', variables('templateDescription'))).outputResources]" },
-          "context": { "value": { } },
-          "mapperTemplateUri": { "value": "[uri(deployment().properties.templateLink.uri, 'output-mapper.json')]" }
-        }
-      }
-    }
-  ],
-  "outputs": {
-  }
-}

drivers/json/deploy-template-with-param.json

@@ -1,44 +0,0 @@
-{
-  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    "templateFileUri": {
-      "type": "string",
-      "minLength": 1,
-      "metadata": {
-        "description": "Template file to deploy."
-      }
-    },
-    "templateParamUri": {
-      "type": "string",
-      "minLength": 1,
-      "metadata": {
-        "description": "Template parameters file to deploy alowgwith the template."
-      }
-    }
-  },
-  "variables": {
-    "templateParts": "[split(parameters('templateParamUri'),'/')]",
-    "templateDescription": "[variables('templateParts')[sub(length(variables('templateParts')), 1)]]"
-  },
-  "resources": [
-    {
-      "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2016-02-01",
-      "name": "[concat('deploy-', variables('templateDescription'))]",
-      "properties": {
-        "mode": "Complete",
-        "templateLink": {
-          "uri": "[parameters('templateFileUri')]",
-          "contentVersion": "1.0.0.0"
-        },
-        "parametersLink": {
-          "uri": "[parameters('templateParamUri')]",
-          "contentVersion": "1.0.0.0"
-        }
-      }
-    }
-  ],
-    "outputs": {
-    }
-}

drivers/json/deploy-template-with-param.parameters.json

@@ -1,8 +0,0 @@
-{
-  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    "templateFileUri": { "value": "https://pnparmtest.blob.core.windows.net/rohittest/ARMBuildingBlocks/Templates/buildingBlocks/multi-vm-n-nic-m-storage/azuredeploy.json" },
-    "templateParamUri": { "value": "https://pnparmtest.blob.core.windows.net/rohittest/ARMBuildingBlocks/Templates/buildingBlocks/multi-vm-n-nic-m-storage/azuredeploy.parameters.json" }
-  }
-}

drivers/json/output-mapper.json

@@ -1,79 +0,0 @@
-{
-  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    "deploymentContext": { "type": "object" },
-    "source": { "type": "object" },
-    "context": { "type": "object" },
-    "state": {
-      "type": "array",
-      "defaultValue": [ ]
-    },
-    "iteration": {
-      "type": "int",
-      "defaultValue": 0
-    }
-  },
-  "variables": {
-    "referenceTemplate": "[uri(deployment().properties.templateLink.uri, '../../Templates/resources/common/reference.json')]",
-    "templateUniqueString": "[uniqueString(concat(string(parameters('deploymentContext')), string(parameters('source')), string(parameters('context')), string(parameters('state')), parameters('iteration')))]",
-    "idParts": "[split(parameters('source').id, '/')]"
-
-  },
-  "resources": [
-    {
-      "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2015-01-01",
-      "name": "[concat(parameters('deploymentContext').parentTemplateUniqueString, '-resRef', parameters('iteration'), '-', variables('templateUniqueString'))]",
-      "properties": {
-        "mode": "Incremental",
-        "templateLink": {
-          "uri": "[variables('referenceTemplate')]"
-        },
-        "parameters": {
-          "deploymentContext": {
-            "value": {
-              "parentTemplateUniqueString": "[concat(variables('templateUniqueString') , '-resRef', parameters('iteration'))]"
-            }
-          },
-          "resourceType": {
-            "value": "[concat(variables('idParts')[0], '/', variables('idParts')[1])]"
-          },
-          "resourceName1": {
-            "value": "[variables('idParts')[2]]"
-          }
-        }
-      }
-    },
-    {
-      "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2015-01-01",
-      "name": "[concat(parameters('deploymentContext').parentTemplateUniqueString, '-output', parameters('iteration'), '-', variables('templateUniqueString'))]",
-      "properties": {
-        "mode": "Incremental",
-        "parameters": { },
-        "template": {
-          "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-          "contentVersion": "1.0.0.0",
-          "parameters": { },
-          "variables": { },
-          "resources": [ ],
-          "outputs": {
-            "instance": {
-              "type": "array",
-              "value": [
-                "[reference(concat(parameters('deploymentContext').parentTemplateUniqueString, '-resRef', parameters('iteration'), '-', variables('templateUniqueString'))).outputs.reference.value]"
-              ]
-            }
-          }
-        }
-      }
-    }
-  ],
-  "outputs": {
-    "collection": {
-      "type": "array",
-      "value": "[concat(parameters('state'), reference(concat(parameters('deploymentContext').parentTemplateUniqueString, '-output', parameters('iteration'), '-', variables('templateUniqueString'))).outputs.instance.value)]"
-    }
-  }
-}

drivers/ps/Deploy-Template.ps1

@@ -1,40 +0,0 @@
-param(
-  [parameter(Mandatory=$true)]$SubscriptionName,
-  [parameter(Mandatory=$true)]$ResourceGroupName,
-  [parameter(Mandatory=$true)]$Location,
-  [parameter(Mandatory=$true)]$DeploymentName,
-  [parameter(Mandatory=$true)]$TemplateUri,
-  [parameter(Mandatory=$true)]$TemplateParametersUri
-)
-
-# Login to Azure and select your subscription
-Login-AzureRmAccount
-Select-AzureRmSubscription -SubscriptionName $SubscriptionName | Out-Null
-
-################################################################################################################
-# Make sure that the following parameters match the ones in the template if you're using existing infrastructure
-
-#$ResourceGroupName='myapp-rg'
-#$DeploymentName='myapp-rg-dep'
-#$Location='West US'
-
-$resourceGroup = Get-AzureRmResourceGroup -Name $ResourceGroupName -Location $Location | Out-Null
-if ($resourceGroup -eq $null) {
-  # We need to create the resource group
-  $resourceGroup = New-AzureRmResourceGroup -Name $ResourceGroupName -Location $Location
-}
-
-
-# Template and parameters file URIs
-#$TemplateUri = 'https://raw.githubusercontent.com/mspnp/blueprints/kirpas/buildingblocks/ARMBuildingBlocks/ARMBuildingBlocks/Templates/buildingBlocks/vnet-n-subnet/azuredeploy.json'
-#$templateParamUri='https://raw.githubusercontent.com/mspnp/blueprints/kirpas/buildingblocks/ARMBuildingBlocks/ARMBuildingBlocks/Templates/buildingBlocks/vnet-n-subnet/scenarios/azuredeploy.parameters.json'
-
-$result = Test-AzureRmResourceGroupDeployment -ResourceGroupName $resourceGroup.ResourceGroupName -TemplateUri $TemplateUri -TemplateParameterUri $TemplateParametersUri
-
-# Test-AzureRmResourceGroupDeployment returns a list of PSResourceManagerError objects, so a count of 0 is all clear signal!
-if ($result.Count -eq 0) {
-  New-AzureRmResourceGroupDeployment -Name $DeploymentName -ResourceGroupName $resourceGroup.ResourceGroupName -TemplateUri $TemplateUri -TemplateParameterUri $TemplateParametersUri
-}
-else{
-  $($result)
-}

drivers/ps/deploy-vnet-n-subnets.ps1

@@ -1,30 +0,0 @@
-#
-# Deploys a vnet and subnets in a resource group creating a 3 tier IaaS architecture
-#
-
-# Login to Azure and select your subscription
-Login-AzureRmAccount
-Select-AzureRmSubscription -SubscriptionName 'Pnp Networking'
-
-################################################################################################################
-# Make sure that the following parameters match the ones in the template if you're using existing infrastructure
-
-$resourceGroupName='myapp-rg'
-$deploymentName='myapp-rg-dep'
-$location='West US'
-
-# Create new resource group
-New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
-
-# Template and parameters file URIs
-$templateUri = 'https://raw.githubusercontent.com/mspnp/blueprints/kirpas/buildingblocks/ARMBuildingBlocks/ARMBuildingBlocks/Templates/buildingBlocks/vnet-n-subnet/azuredeploy.json'
-$templateParamUri='https://raw.githubusercontent.com/mspnp/blueprints/kirpas/buildingblocks/ARMBuildingBlocks/ARMBuildingBlocks/Templates/buildingBlocks/vnet-n-subnet/scenarios/azuredeploy.parameters.json'
-
-$result = Test-AzureRmResourceGroupDeployment -ResourceGroupName $resourceGroupName -TemplateUri $templateUri -TemplateParameterUri $templateParamUri
-
-# Test-AzureRmResourceGroupDeployment returns a list of PSResourceManagerError objects, so a count of 0 is all clear signal!
-if($result.Count -eq 0){
-	New-AzureRmResourceGroupDeployment -Name $deploymentName -ResourceGroupName $resourceGroupName -TemplateUri $templateUri -TemplateParameterUri $templateParamUri -Verbose
-}else{
-    $result
-}

scenarios/dmz/azuredeploy.json

@@ -0,0 +1,36 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "templateParameterUri": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Template parameters file to use with the building block template."
+      }
+    }
+  },
+  "variables": {
+    "baseUri": "https://raw.githubusercontent.com/mspnp/template-building-blocks/master/templates",
+    "templateParts": "[split(parameters('templateParameterUri'),'/')]",
+    "templateDescription": "[split(variables('templateParts')[sub(length(variables('templateParts')), 1)], '.')[0]]"
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2016-02-01",
+      "name": "[concat('deploy-', variables('templateDescription'))]",
+      "properties": {
+        "mode": "Incremental",
+        "templateLink": {
+          "uri": "[concat(variables('baseUri'), '/buildingBlocks/dmz/azuredeploy.json')]"
+        },
+        "parametersLink": {
+          "uri": "[parameters('templateParameterUri')]"
+        }
+      }
+    }
+  ],
+    "outputs": {
+    }
+}

scenarios/loadBalancer-backend-n-vm/azuredeploy.json

@@ -0,0 +1,36 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "templateParameterUri": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Template parameters file to use with the building block template."
+      }
+    }
+  },
+  "variables": {
+    "baseUri": "https://raw.githubusercontent.com/mspnp/template-building-blocks/master/templates",
+    "templateParts": "[split(parameters('templateParameterUri'),'/')]",
+    "templateDescription": "[split(variables('templateParts')[sub(length(variables('templateParts')), 1)], '.')[0]]"
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2016-02-01",
+      "name": "[concat('deploy-', variables('templateDescription'))]",
+      "properties": {
+        "mode": "Incremental",
+        "templateLink": {
+          "uri": "[concat(variables('baseUri'), '/buildingBlocks/loadBalancer-backend-n-vm/azuredeploy.json')]"
+        },
+        "parametersLink": {
+          "uri": "[parameters('templateParameterUri')]"
+        }
+      }
+    }
+  ],
+    "outputs": {
+    }
+}

scenarios/multi-vm-n-nic-m-storage/azuredeploy.json

@@ -0,0 +1,36 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "templateParameterUri": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Template parameters file to use with the building block template."
+      }
+    }
+  },
+  "variables": {
+    "baseUri": "https://raw.githubusercontent.com/mspnp/template-building-blocks/master/templates",
+    "templateParts": "[split(parameters('templateParameterUri'),'/')]",
+    "templateDescription": "[split(variables('templateParts')[sub(length(variables('templateParts')), 1)], '.')[0]]"
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2016-02-01",
+      "name": "[concat('deploy-', variables('templateDescription'))]",
+      "properties": {
+        "mode": "Incremental",
+        "templateLink": {
+          "uri": "[concat(variables('baseUri'), '/buildingBlocks/multi-vm-n-nic-m-storage/azuredeploy.json')]"
+        },
+        "parametersLink": {
+          "uri": "[parameters('templateParameterUri')]"
+        }
+      }
+    }
+  ],
+    "outputs": {
+    }
+}

scenarios/networkSecurityGroups/azuredeploy.json

@@ -0,0 +1,36 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "templateParameterUri": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Template parameters file to use with the building block template."
+      }
+    }
+  },
+  "variables": {
+    "baseUri": "https://raw.githubusercontent.com/mspnp/template-building-blocks/master/templates",
+    "templateParts": "[split(parameters('templateParameterUri'),'/')]",
+    "templateDescription": "[split(variables('templateParts')[sub(length(variables('templateParts')), 1)], '.')[0]]"
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2016-02-01",
+      "name": "[concat('deploy-', variables('templateDescription'))]",
+      "properties": {
+        "mode": "Incremental",
+        "templateLink": {
+          "uri": "[concat(variables('baseUri'), '/buildingBlocks/networkSecurityGroups/azuredeploy.json')]"
+        },
+        "parametersLink": {
+          "uri": "[parameters('templateParameterUri')]"
+        }
+      }
+    }
+  ],
+    "outputs": {
+    }
+}

scenarios/userDefinedRoutes/azuredeploy.json

@@ -0,0 +1,36 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "templateParameterUri": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Template parameters file to use with the building block template."
+      }
+    }
+  },
+  "variables": {
+    "baseUri": "https://raw.githubusercontent.com/mspnp/template-building-blocks/master/templates",
+    "templateParts": "[split(parameters('templateParameterUri'),'/')]",
+    "templateDescription": "[split(variables('templateParts')[sub(length(variables('templateParts')), 1)], '.')[0]]"
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2016-02-01",
+      "name": "[concat('deploy-', variables('templateDescription'))]",
+      "properties": {
+        "mode": "Incremental",
+        "templateLink": {
+          "uri": "[concat(variables('baseUri'), '/buildingBlocks/userDefinedRoutes/azuredeploy.json')]"
+        },
+        "parametersLink": {
+          "uri": "[parameters('templateParameterUri')]"
+        }
+      }
+    }
+  ],
+    "outputs": {
+    }
+}

scenarios/virtualMachine-extensions/azuredeploy.json

@@ -0,0 +1,36 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "templateParameterUri": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Template parameters file to use with the building block template."
+      }
+    }
+  },
+  "variables": {
+    "baseUri": "https://raw.githubusercontent.com/mspnp/template-building-blocks/master/templates",
+    "templateParts": "[split(parameters('templateParameterUri'),'/')]",
+    "templateDescription": "[split(variables('templateParts')[sub(length(variables('templateParts')), 1)], '.')[0]]"
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2016-02-01",
+      "name": "[concat('deploy-', variables('templateDescription'))]",
+      "properties": {
+        "mode": "Incremental",
+        "templateLink": {
+          "uri": "[concat(variables('baseUri'), '/buildingBlocks/virtualMachine-extensions/azuredeploy.json')]"
+        },
+        "parametersLink": {
+          "uri": "[parameters('templateParameterUri')]"
+        }
+      }
+    }
+  ],
+    "outputs": {
+    }
+}

scenarios/vnet-n-subnet/azuredeploy.json

@@ -0,0 +1,36 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "templateParameterUri": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Template parameters file to use with the building block template."
+      }
+    }
+  },
+  "variables": {
+    "baseUri": "https://raw.githubusercontent.com/mspnp/template-building-blocks/master/templates",
+    "templateParts": "[split(parameters('templateParameterUri'),'/')]",
+    "templateDescription": "[split(variables('templateParts')[sub(length(variables('templateParts')), 1)], '.')[0]]"
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2016-02-01",
+      "name": "[concat('deploy-', variables('templateDescription'))]",
+      "properties": {
+        "mode": "Incremental",
+        "templateLink": {
+          "uri": "[concat(variables('baseUri'), '/buildingBlocks/vnet-n-subnet/azuredeploy.json')]"
+        },
+        "parametersLink": {
+          "uri": "[parameters('templateParameterUri')]"
+        }
+      }
+    }
+  ],
+  "outputs": {
+  }
+}

scenarios/vpn-gateway-vpn-connection/azuredeploy.json

@@ -0,0 +1,36 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "templateParameterUri": {
+      "type": "string",
+      "minLength": 1,
+      "metadata": {
+        "description": "Template parameters file to use with the building block template."
+      }
+    }
+  },
+  "variables": {
+    "baseUri": "https://raw.githubusercontent.com/mspnp/template-building-blocks/master/templates",
+    "templateParts": "[split(parameters('templateParameterUri'),'/')]",
+    "templateDescription": "[split(variables('templateParts')[sub(length(variables('templateParts')), 1)], '.')[0]]"
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2016-02-01",
+      "name": "[concat('deploy-', variables('templateDescription'))]",
+      "properties": {
+        "mode": "Incremental",
+        "templateLink": {
+          "uri": "[concat(variables('baseUri'), '/buildingBlocks/vpn-gateway-vpn-connection/azuredeploy.json')]"
+        },
+        "parametersLink": {
+          "uri": "[parameters('templateParameterUri')]"
+        }
+      }
+    }
+  ],
+    "outputs": {
+    }
+}

template-building-blocks.deployproj

@@ -29,13 +29,33 @@
       <Visible>False</Visible>
     </None>
     <Content Include="Scripts\Deploy-AzureResourceGroup.ps1" />
-    <None Include="drivers\bash\deploy-template-with-param.sh" />
+    <None Include="scenarios\dmz\azuredeploy.json" />
-    <None Include="drivers\json\deploy-template-with-param.json" />
+    <None Include="scenarios\dmz\parameters\azuredeploy.parameters.json" />
-    <None Include="drivers\json\deploy-template-with-param.parameters.json" />
+    <None Include="scenarios\dmz\parameters\internal-dmz.parameters.json" />
-    <None Include="drivers\json\deploy-template-return-outputs.json" />
+    <None Include="scenarios\dmz\parameters\public-dmz.parameters.json" />
-    <None Include="drivers\json\output-mapper.json" />
+    <None Include="scenarios\loadBalancer-backend-n-vm\azuredeploy.json" />
-    <None Include="drivers\ps\Deploy-Template.ps1" />
+    <None Include="scenarios\loadBalancer-backend-n-vm\parameters\internal-loadBalancer-multi-backends.parameters.json" />
-    <None Include="drivers\ps\deploy-vnet-n-subnets.ps1" />
+    <None Include="scenarios\loadBalancer-backend-n-vm\parameters\internal-loadBalancer.parameters.json" />
+    <None Include="scenarios\loadBalancer-backend-n-vm\parameters\public-loadBalancer.parameters.json" />
+    <None Include="scenarios\multi-vm-n-nic-m-storage\azuredeploy.json" />
+    <None Include="scenarios\multi-vm-n-nic-m-storage\parameters\single-vm.parameters.json" />
+    <None Include="scenarios\multi-vm-n-nic-m-storage\parameters\vms-multiple-nics-dataDisks-extensions.parameters.json" />
+    <None Include="scenarios\multi-vm-n-nic-m-storage\parameters\vms-single-nic-extensions.parameters.json" />
+    <None Include="scenarios\multi-vm-n-nic-m-storage\parameters\vms-single-nic.parameters.json" />
+    <None Include="scenarios\networkSecurityGroups\azuredeploy.json" />
+    <None Include="scenarios\networkSecurityGroups\parameters\3-nsgs-on-3-subnets.parameters.json" />
+    <None Include="scenarios\networkSecurityGroups\parameters\multiple-nsgs-on-subnets-nics.parameters.json" />
+    <None Include="scenarios\userDefinedRoutes\azuredeploy.json" />
+    <None Include="scenarios\userDefinedRoutes\parameters\multiple-routes-on-subnets.parameters.json" />
+    <None Include="scenarios\virtualMachine-extensions\azuredeploy.json" />
+    <None Include="scenarios\virtualMachine-extensions\parameters\multiple-extensions-on-vms.parameters.json" />
+    <None Include="scenarios\vnet-n-subnet\azuredeploy.json" />
+    <None Include="scenarios\vnet-n-subnet\parameters\vnet-3-tier-mgmt-gw.parameters.json" />
+    <None Include="scenarios\vnet-n-subnet\parameters\vnet-multiple-subnet-dns.parameters.json" />
+    <None Include="scenarios\vnet-n-subnet\parameters\vnet-multiple-subnet.parameters.json" />
+    <None Include="scenarios\vpn-gateway-vpn-connection\azuredeploy.json" />
+    <None Include="scenarios\vpn-gateway-vpn-connection\parameters\er.parameters.json" />
+    <None Include="scenarios\vpn-gateway-vpn-connection\parameters\vpn.parameters.json" />
     <None Include="scripts\apache.sh" />
     <None Include="scripts\iisaspnet.ps1" />
     <None Include="scripts\iisaspnet.ps1.zip" />
@@ -49,33 +69,14 @@
     <None Include="templates\buildingBlocks\dmz\mappers\routeTableSettings.json" />
     <None Include="templates\buildingBlocks\dmz\mappers\routeTableSettings-routes.json" />
     <None Include="templates\buildingBlocks\dmz\mappers\virtualMachineSettings.json" />
-    <None Include="templates\buildingBlocks\dmz\scenarios\public-dmz.parameters.json" />
     <None Include="templates\buildingBlocks\loadBalancer-backend-n-vm\azuredeploy.json" />
-    <None Include="templates\buildingBlocks\loadBalancer-backend-n-vm\scenarios\internal-loadBalancer.parameters.json" />
-    <None Include="templates\buildingBlocks\loadBalancer-backend-n-vm\scenarios\internal-loadBalancer-multi-backends.parameters.json" />
-    <None Include="templates\buildingBlocks\loadBalancer-backend-n-vm\scenarios\public-loadBalancer.parameters.json" />
     <None Include="templates\buildingBlocks\multi-vm-n-nic-m-storage\azuredeploy.json" />
-    <None Include="templates\buildingBlocks\multi-vm-n-nic-m-storage\scenarios\single-vm.parameters.json" />
-    <None Include="templates\buildingBlocks\multi-vm-n-nic-m-storage\scenarios\vms-single-nic.parameters.json" />
-    <None Include="templates\buildingBlocks\multi-vm-n-nic-m-storage\scenarios\vms-single-nic-extensions.parameters.json" />
-    <None Include="templates\buildingBlocks\multi-vm-n-nic-m-storage\scenarios\vms-multiple-nics-dataDisks-extensions.parameters.json" />
     <None Include="templates\buildingBlocks\networkSecurityGroups\azuredeploy.json" />
-    <None Include="templates\buildingBlocks\networkSecurityGroups\scenarios\3-nsgs-on-3-subnets.parameters.json" />
-    <None Include="templates\buildingBlocks\networkSecurityGroups\scenarios\multiple-nsgs-on-subnets-nics.parameters.json" />
     <None Include="templates\buildingBlocks\dmz\azuredeploy.json" />
-    <None Include="templates\buildingBlocks\dmz\azuredeploy.parameters.json" />
-    <None Include="templates\buildingBlocks\dmz\scenarios\internal-dmz.parameters.json" />
     <None Include="templates\buildingBlocks\userDefinedRoutes\azuredeploy.json" />
-    <None Include="templates\buildingBlocks\userDefinedRoutes\scenarios\multiple-routes-on-subnets.parameters.json" />
     <None Include="templates\buildingBlocks\virtualMachine-extensions\azuredeploy.json" />
-    <None Include="templates\buildingBlocks\virtualMachine-extensions\scenarios\multiple-extensions-on-vms.parameters.json" />
-    <None Include="templates\buildingBlocks\vnet-n-subnet\scenarios\vnet-3-tier-mgmt-gw.parameters.json" />
-    <None Include="templates\buildingBlocks\vnet-n-subnet\scenarios\vnet-multiple-subnet.parameters.json" />
-    <None Include="templates\buildingBlocks\vnet-n-subnet\scenarios\vnet-multiple-subnet-dns.parameters.json" />
     <None Include="templates\buildingBlocks\vnet-n-subnet\azuredeploy.json" />
     <None Include="templates\buildingBlocks\vpn-gateway-vpn-connection\azuredeploy.json" />
-    <None Include="templates\buildingBlocks\vpn-gateway-vpn-connection\scenarios\er.parameters.json" />
-    <None Include="templates\buildingBlocks\vpn-gateway-vpn-connection\scenarios\vpn.parameters.json" />
     <None Include="templates\resources\common\collector-internal.json" />
     <None Include="templates\resources\common\collector-nop.json" />
     <None Include="templates\resources\common\collector.json" />