Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
63 changes: 38 additions & 25 deletions src/ServiceFabric/ServiceFabric.Test/Resources/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,23 @@
"vmNodeType0Size": {
"type": "string",
"defaultValue": "Standard_D2s_v3"
},
"durabilityLevel": {
"type": "string",
"allowedValues": [
"Silver",
"Gold"
],
"defaultValue": "Silver"
},
"reliabilityLevel": {
"type": "string",
"allowedValues": [
"Silver",
"Gold",
"Platinum"
],
"defaultValue": "Silver"
}
},
"variables": {
Expand Down Expand Up @@ -270,7 +287,10 @@
"dnsSettings": {
"domainNameLabel": "[variables('dnsName')]"
},
"publicIPAllocationMethod": "Dynamic"
"publicIPAllocationMethod": "Static"
},
"sku": {
"name": "Standard"
},
"tags": {
"resourceType": "Service Fabric",
Expand Down Expand Up @@ -433,13 +453,16 @@
}
]
},
"sku": {
"name": "Standard"
},
"tags": {
"resourceType": "Service Fabric",
"clusterName": "[parameters('clusterName')]"
}
},
{
"apiVersion": "2015-06-15",
"apiVersion": "2017-06-01",
"type": "Microsoft.Network/networkSecurityGroups",
"name": "[concat('nsg', variables('subnet0Name'))]",
"location": "[resourceGroup().location]",
Expand All @@ -456,8 +479,7 @@
"protocol": "*",
"sourceAddressPrefix": "VirtualNetwork",
"sourcePortRange": "*"
},
"comments": "allow SMB traffic within the net, used by fabric to move packages around"
}
},
{
"name": "allowSvcFabCluser",
Expand All @@ -470,8 +492,7 @@
"protocol": "*",
"sourceAddressPrefix": "VirtualNetwork",
"sourcePortRange": "*"
},
"comments": "allow ports within vnet that are used by the fabric to talk between nodes"
}
},
{
"name": "allowSvcFabEphemeral",
Expand All @@ -484,8 +505,7 @@
"protocol": "*",
"sourceAddressPrefix": "VirtualNetwork",
"sourcePortRange": "*"
},
"comments": "allow fabric ephemeral ports within the vnet"
}
},
{
"name": "allowSvcFabPortal",
Expand All @@ -498,8 +518,7 @@
"protocol": "*",
"sourceAddressPrefix": "*",
"sourcePortRange": "*"
},
"comments": "allow port used to access the fabric cluster web portal"
}
},
{
"name": "allowSvcFabClient",
Expand All @@ -512,8 +531,7 @@
"protocol": "*",
"sourceAddressPrefix": "*",
"sourcePortRange": "*"
},
"comments": "allow port used by the fabric client (includes powershell)"
}
},
{
"name": "allowSvcFabApplication",
Expand All @@ -526,8 +544,7 @@
"protocol": "*",
"sourceAddressPrefix": "*",
"sourcePortRange": "*"
},
"comments": "allow fabric application ports within the vnet"
}
},
{
"name": "blockAll",
Expand All @@ -540,8 +557,7 @@
"protocol": "*",
"sourceAddressPrefix": "*",
"sourcePortRange": "*"
},
"comments": "block all traffic except what we've explicitly allowed"
}
},
{
"name": "allowVNetRDP",
Expand All @@ -554,8 +570,7 @@
"protocol": "*",
"sourceAddressPrefix": "*",
"sourcePortRange": "*"
},
"comments": "allow RDP within the net"
}
},
{
"name": "allowAppPort1",
Expand All @@ -568,8 +583,7 @@
"protocol": "*",
"sourceAddressPrefix": "*",
"sourcePortRange": "*"
},
"comments": "allow public application port 1"
}
},
{
"name": "allowAppPort2",
Expand All @@ -582,8 +596,7 @@
"protocol": "*",
"sourceAddressPrefix": "*",
"sourcePortRange": "*"
},
"comments": "allow public application port 2"
}
}
]
},
Expand Down Expand Up @@ -638,7 +651,7 @@
"clusterEndpoint": "[reference(parameters('clusterName')).clusterEndpoint]",
"nodeTypeRef": "[variables('vmNodeType0Name')]",
"dataPath": "D:\\SvcFab",
"durabilityLevel": "Silver",
"durabilityLevel": "[parameters('durabilityLevel')]",
"enableParallelJobs": true,
"nicPrefixOverride": "[variables('subnet0Prefix')]",
"certificate": {
Expand Down Expand Up @@ -823,7 +836,7 @@
"startPort": "[variables('nt0applicationStartPort')]"
},
"clientConnectionEndpointPort": "[variables('nt0fabricTcpGatewayPort')]",
"durabilityLevel": "Silver",
"durabilityLevel": "[parameters('durabilityLevel')]",
"ephemeralPorts": {
"endPort": "[variables('nt0ephemeralEndPort')]",
"startPort": "[variables('nt0ephemeralStartPort')]"
Expand All @@ -834,7 +847,7 @@
}
],
"provisioningState": "Default",
"reliabilityLevel": "Silver",
"reliabilityLevel": "[parameters('reliabilityLevel')]",
"upgradeMode": "Automatic",
"vmImage": "Windows"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,10 @@
"dnsSettings": {
"domainNameLabel": "[variables('dnsName')]"
},
"publicIPAllocationMethod": "Dynamic"
"publicIPAllocationMethod": "Static"
},
"sku": {
"name": "Standard"
},
"tags": {
"resourceType": "Service Fabric",
Expand All @@ -291,6 +294,9 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/',concat(variables('lbIPName'),'-',variables('vmNodeType0Name')))]"
],
"sku": {
"name": "Standard"
},
"properties": {
"frontendIPConfigurations": [
{
Expand Down Expand Up @@ -445,7 +451,7 @@
}
},
{
"apiVersion": "2015-06-15",
"apiVersion": "2017-06-01",
"type": "Microsoft.Network/networkSecurityGroups",
"name": "[concat('nsg', variables('subnet0Name'))]",
"location": "[resourceGroup().location]",
Expand Down
8 changes: 4 additions & 4 deletions src/ServiceFabric/ServiceFabric.Test/ScenarioTests/Common.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -68,24 +68,24 @@ function Get-NewCertName
function Get-SecretUrl
{
# Thumbprint for this cert should be specified in TestServiceFabric.cs as well in ServiceFabricCmdletBase.TestThumbprint
return "https://azurermsfkvtest.vault.azure.net:443/secrets/AzureRMSFTestCert2/6648a0d27b9044b0b437d0ccaca0204f"
return "https://azurermsfkvtest.vault.azure.net:443/secrets/AzureRMSFTestCert2/9d32304d6b1044d58b00f989f8bce73e"
}

function Get-InitialThumbprint
{
return "27F73AA239055A16C9EA809B985CC3170E4A7EAB"
return "5472875FDA4D5578A3DAD037BBCE600015214C42"
}

function Get-Thumbprint
{
# Change the thumbprint in the TestServiceFabric.cs file as well in ServiceFabricCmdletBase.TestThumbprint
return "AFE6D1166D030CFDBAAEE74CA5A5F5256BE3FF49"
return "4D59A08F0039D124316D89680F89024C9E5EC9C4"
}

function Get-CertAppSecretUrl
{
# Thumbprint for this cert should be specified in TestServiceFabric.cs in ServiceFabricCmdletBase.TestThumbprintAppCert
return "https://azurermsfkvtest.vault.azure.net:443/secrets/AzureRMSFTestCertApp/af9f8cce090449bc9646cf40257ab19a"
return "https://azurermsfkvtest.vault.azure.net/secrets/AzureRMSFTestCertApp/af9f8cce090449bc9646cf40257ab19a"
}

function Get-CertAppThumbprint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public TestServiceFabric(ITestOutputHelper output) : base(output)
ServiceFabricCmdletBase.RunningTest = true;
ServiceFabricCmdletBase.NewCreatedKeyVaultWaitTimeInSec = 0;
//change the thumbprint in the common.ps1 file as well
ServiceFabricCmdletBase.TestThumbprint = "AFE6D1166D030CFDBAAEE74CA5A5F5256BE3FF49";
ServiceFabricCmdletBase.TestThumbprint = "4D59A08F0039D124316D89680F89024C9E5EC9C4";
ServiceFabricCmdletBase.TestCommonNameCACert = "azurermsfcntest.southcentralus.cloudapp.azure.com";
ServiceFabricCmdletBase.TestCommonNameAppCert = "AzureRMSFTestCertApp";
ServiceFabricCmdletBase.TestThumbprintAppCert = "D9BAB3CC41F5EA798DD086402C1A4EDADEB42B2A";
Expand Down

Large diffs are not rendered by default.

Loading