Update pricing descriptions to support D1v2 replacement for A2 for all pricing plans

client/src/app/shared/models/constants.ts

@@ -141,6 +141,7 @@ export class Links {
     public static communityTemplatesLink = 'https://go.microsoft.com/fwlink/?linkid=2022552';
     public static linuxContainersLearnMore = 'https://go.microsoft.com/fwlink/?linkid=861969';
     public static premiumV2NotAvailableLearnMore = 'https://go.microsoft.com/fwlink/?linkid=2009376';
+    public static azureComputeUnitLearnMore = 'https://go.microsoft.com/fwlink/?linkid=2027465';
 }
 
 export class Kinds {

client/src/app/shared/models/portal-resources.ts

@@ -999,6 +999,7 @@
     public static pricing_includedFeaturesDesc = 'pricing_includedFeaturesDesc';
     public static pricing_includedHardware = 'pricing_includedHardware';
     public static pricing_includedHardwareDesc = 'pricing_includedHardwareDesc';
+    public static pricing_includedHardware_azureComputeUnits = 'pricing_includedHardware_azureComputeUnits';
     public static pricing_linuxTrial = 'pricing_linuxTrial';
     public static pricing_windowsContainers = 'pricing_windowsContainers';
     public static pricing_emptyIsolatedGroup = 'pricing_emptyIsolatedGroup';
@@ -1014,8 +1015,7 @@
     public static pricing_applyButtonLabel = 'pricing_applyButtonLabel';
     public static pricing_sharedInfrastructure = 'pricing_sharedInfrastructure';
     public static pricing_sharedCpu = 'pricing_sharedCpu';
-    public static pricing_aSeriesDedicatedCpu = 'pricing_aSeriesDedicatedCpu';
-    public static pricing_dv2SeriesDedicatedCpu = 'pricing_dv2SeriesDedicatedCpu';
+    public static pricing_computeDedicatedAcu = 'pricing_computeDedicatedAcu';
     public static pricing_sharedMemory = 'pricing_sharedMemory';
     public static pricing_dedicatedMemory = 'pricing_dedicatedMemory';
     public static pricing_sharedDisk = 'pricing_sharedDisk';
@@ -1048,8 +1048,8 @@
     public static pricing_memory = 'pricing_memory';
     public static pricing_computeLimit = 'pricing_computeLimit';
     public static pricing_numCores = 'pricing_numCores';
-    public static pricing_aSeriesCompute = 'pricing_aSeriesCompute';
-    public static pricing_dSeriesCompute = 'pricing_dSeriesCompute';
+    public static pricing_aSeriesComputeEquivalent = 'pricing_aSeriesComputeEquivalent';
+    public static pricing_dSeriesComputeEquivalent = 'pricing_dSeriesComputeEquivalent';
     public static proxyJsonInvalid = 'proxyJsonInvalid';
     public static schemaJsonInvalid = 'schemaJsonInvalid';
     public static operationId = 'operationId';
@@ -1157,8 +1157,7 @@
     public static edit = 'edit';
     public static sync = 'sync';
     public static deploymentCredentials = 'deploymentCredentials';
-    public static pricing_dv3SeriesCompute = 'pricing_dv3SeriesCompute';
-    public static pricing_dv3SeriesDedicatedCpu = 'pricing_dv3SeriesDedicatedCpu';
+    public static pricing_dv3SeriesComputeEquivalent = 'pricing_dv3SeriesComputeEquivalent';
     public static funcConnStringsInfoText = 'funcConnStringsInfoText';
     public static appFunctionSettings_functionAppSettings_versionLoading = 'appFunctionSettings_functionAppSettings_versionLoading';
     public static readOnlyLocalCache = 'readOnlyLocalCache';

client/src/app/site/spec-picker/price-spec-manager/basic-plan-price-spec.ts

@@ -8,29 +8,29 @@ export abstract class BasicPlanPriceSpec extends PriceSpec {
     featureItems = [{
         iconUrl: 'image/ssl.svg',
         title: this._ts.instant(PortalResources.pricing_customDomainsSsl),
-        description: this._ts.instant(PortalResources.pricing_customDomainsSslDesc)
+        description: this._ts.instant(PortalResources.pricing_customDomainsSslDesc),
     },
     {
         iconUrl: 'image/scale-up.svg',
         title: this._ts.instant(PortalResources.pricing_manualScale),
-        description: this._ts.instant(PortalResources.pricing_scaleDesc).format(3)
+        description: this._ts.instant(PortalResources.pricing_scaleDesc).format(3),
     }];
 
     hardwareItems = [{
         iconUrl: 'image/app-service-plan.svg',
-        title: this._ts.instant(PortalResources.cpu),
-        description: this._ts.instant(PortalResources.pricing_aSeriesDedicatedCpu),
-        learnMoreUrl: Links.vmSizeLearnMore
+        title: this._ts.instant(PortalResources.pricing_includedHardware_azureComputeUnits),
+        description: this._ts.instant(PortalResources.pricing_computeDedicatedAcu),
+        learnMoreUrl: Links.azureComputeUnitLearnMore,
     },
     {
         iconUrl: 'image/website-power.svg',
         title: this._ts.instant(PortalResources.memory),
-        description: this._ts.instant(PortalResources.pricing_dedicatedMemory)
+        description: this._ts.instant(PortalResources.pricing_dedicatedMemory),
     },
     {
         iconUrl: 'image/storage.svg',
         title: this._ts.instant(PortalResources.storage),
-        description: this._ts.instant(PortalResources.pricing_sharedDisk).format('10 GB')
+        description: this._ts.instant(PortalResources.pricing_sharedDisk).format('10 GB'),
     }];
 
     cssClass = 'spec basic-spec';
@@ -59,10 +59,9 @@ export class BasicSmallPlanPriceSpec extends BasicPlanPriceSpec {
     skuCode = 'B1';
     legacySkuName = 'small_basic';
     topLevelFeatures = [
-        this._ts.instant(PortalResources.pricing_numCores).format('1x'),
         this._ts.instant(PortalResources.pricing_ACU).format('100'),
         this._ts.instant(PortalResources.pricing_memory).format('1.75'),
-        this._ts.instant(PortalResources.pricing_aSeriesCompute)
+        this._ts.instant(PortalResources.pricing_aSeriesComputeEquivalent),
     ];
 
     meterFriendlyName = 'Basic Small App Service Hours';
@@ -80,10 +79,9 @@ export class BasicMediumPlanPriceSpec extends BasicPlanPriceSpec {
     skuCode = 'B2';
     legacySkuName = 'medium_basic';
     topLevelFeatures = [
-        this._ts.instant(PortalResources.pricing_numCores).format('2x'),
         this._ts.instant(PortalResources.pricing_ACU).format('200'),
         this._ts.instant(PortalResources.pricing_memory).format('3.5'),
-        this._ts.instant(PortalResources.pricing_aSeriesCompute)
+        this._ts.instant(PortalResources.pricing_aSeriesComputeEquivalent),
     ];
 
     meterFriendlyName = 'Basic Medium App Service Hours';
@@ -101,10 +99,9 @@ export class BasicLargePlanPriceSpec extends BasicPlanPriceSpec {
     skuCode = 'B3';
     legacySkuName = 'large_basic';
     topLevelFeatures = [
-        this._ts.instant(PortalResources.pricing_numCores).format('4x'),
         this._ts.instant(PortalResources.pricing_ACU).format('400'),
         this._ts.instant(PortalResources.pricing_memory).format('7'),
-        this._ts.instant(PortalResources.pricing_aSeriesCompute)
+        this._ts.instant(PortalResources.pricing_aSeriesComputeEquivalent),
     ];
 
     meterFriendlyName = 'Basic Large App Service Hours';

client/src/app/site/spec-picker/price-spec-manager/elastic-premium-plan-price-spec.ts

@@ -40,9 +40,9 @@ export abstract class ElasticPremiumPlanPriceSpec extends DV2SeriesPriceSpec {
     hardwareItems = [
         {
             iconUrl: 'image/app-service-plan.svg',
-            title: this._ts.instant(PortalResources.cpu),
-            description: this._ts.instant(PortalResources.pricing_dv2SeriesDedicatedCpu),
-            learnMoreUrl: Links.vmSizeLearnMore,
+            title: this._ts.instant(PortalResources.pricing_includedHardware_azureComputeUnits),
+            description: this._ts.instant(PortalResources.pricing_computeDedicatedAcu),
+            learnMoreUrl: Links.azureComputeUnitLearnMore,
         },
         {
             iconUrl: 'image/website-power.svg',
@@ -83,10 +83,9 @@ export class ElasticPremiumSmallPlanPriceSpec extends ElasticPremiumPlanPriceSpe
     skuCode = 'EP1';
     legacySkuName = 'small_elastic_premium';
     topLevelFeatures = [
-        this._ts.instant(PortalResources.pricing_numCores).format('1x'),
         this._ts.instant(PortalResources.pricing_ACU).format('210'),
         this._ts.instant(PortalResources.pricing_memory).format('3.5'),
-        this._ts.instant(PortalResources.pricing_dSeriesCompute),
+        this._ts.instant(PortalResources.pricing_dSeriesComputeEquivalent),
     ];
 
     meterFriendlyName = 'Premium V2 Small App Service Hours';
@@ -101,10 +100,9 @@ export class ElasticPremiumMediumPlanPriceSpec extends ElasticPremiumPlanPriceSp
     skuCode = 'EP2';
     legacySkuName = 'medium_elastic_premium';
     topLevelFeatures = [
-        this._ts.instant(PortalResources.pricing_numCores).format('2x'),
         this._ts.instant(PortalResources.pricing_ACU).format('420'),
         this._ts.instant(PortalResources.pricing_memory).format('7'),
-        this._ts.instant(PortalResources.pricing_dSeriesCompute),
+        this._ts.instant(PortalResources.pricing_dSeriesComputeEquivalent),
     ];
 
     meterFriendlyName = 'Premium V2 Medium App Service Hours';
@@ -119,10 +117,9 @@ export class ElasticPremiumLargePlanPriceSpec extends ElasticPremiumPlanPriceSpe
     skuCode = 'EP3';
     legacySkuName = 'large_elastic_premium';
     topLevelFeatures = [
-        this._ts.instant(PortalResources.pricing_numCores).format('4x'),
         this._ts.instant(PortalResources.pricing_ACU).format('840'),
         this._ts.instant(PortalResources.pricing_memory).format('14'),
-        this._ts.instant(PortalResources.pricing_dSeriesCompute),
+        this._ts.instant(PortalResources.pricing_dSeriesComputeEquivalent),
     ];
 
     meterFriendlyName = 'Premium V2 Large App Service Hours';

client/src/app/site/spec-picker/price-spec-manager/free-plan-price-spec.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs/Observable';
-import { Kinds } from './../../../shared/models/constants';
+import { Kinds, Links } from './../../../shared/models/constants';
 import { PortalResources } from './../../../shared/models/portal-resources';
 import { AppKind } from './../../../shared/Utilities/app-kind';
 import { PriceSpec, PriceSpecInput } from './price-spec';
@@ -10,25 +10,26 @@ export class FreePlanPriceSpec extends PriceSpec {
     topLevelFeatures = [
         this._ts.instant(PortalResources.pricing_sharedInfrastructure),
         this._ts.instant(PortalResources.pricing_memory).format(1),
-        this._ts.instant(PortalResources.pricing_computeLimit).format(60)
+        this._ts.instant(PortalResources.pricing_computeLimit).format(60),
     ];
 
     featureItems = null;
 
     hardwareItems = [{
         iconUrl: 'image/app-service-plan.svg',
-        title: this._ts.instant(PortalResources.cpu),
-        description: this._ts.instant(PortalResources.pricing_sharedCpu)
+        title: this._ts.instant(PortalResources.pricing_includedHardware_azureComputeUnits),
+        description: this._ts.instant(PortalResources.pricing_computeDedicatedAcu),
+        learnMoreUrl: Links.azureComputeUnitLearnMore,
     },
     {
         iconUrl: 'image/website-power.svg',
         title: this._ts.instant(PortalResources.memory),
-        description: this._ts.instant(PortalResources.pricing_sharedMemory)
+        description: this._ts.instant(PortalResources.pricing_sharedMemory),
     },
     {
         iconUrl: 'image/storage.svg',
         title: this._ts.instant(PortalResources.storage),
-        description: this._ts.instant(PortalResources.pricing_sharedDisk).format('1 GB')
+        description: this._ts.instant(PortalResources.pricing_sharedDisk).format('1 GB'),
     }];
 
     meterFriendlyName = 'Free App Service';

client/src/app/site/spec-picker/price-spec-manager/isolated-plan-price-spec.ts

@@ -11,44 +11,44 @@ export abstract class IsolatedPlanPriceSpec extends PriceSpec {
     featureItems = [{
         iconUrl: 'image/app-service-environment.svg',
         title: this._ts.instant(PortalResources.pricing_ase),
-        description: this._ts.instant(PortalResources.pricing_aseDesc)
+        description: this._ts.instant(PortalResources.pricing_aseDesc),
     },
     {
         iconUrl: 'image/networking.svg',
         title: this._ts.instant(PortalResources.pricing_isolatedNetwork),
-        description: this._ts.instant(PortalResources.pricing_isolatedNetworkDesc)
+        description: this._ts.instant(PortalResources.pricing_isolatedNetworkDesc),
     },
     {
         iconUrl: 'image/active-directory.svg',
         title: this._ts.instant(PortalResources.pricing_privateAppAccess),
-        description: this._ts.instant(PortalResources.pricing_privateAppAccessDesc)
+        description: this._ts.instant(PortalResources.pricing_privateAppAccessDesc),
     },
     {
         iconUrl: 'image/scale-up.svg',
         title: this._ts.instant(PortalResources.pricing_largeScale),
-        description: this._ts.instant(PortalResources.pricing_largeScaleDesc)
+        description: this._ts.instant(PortalResources.pricing_largeScaleDesc),
     },
     {
         iconUrl: 'image/globe.svg',
         title: this._ts.instant(PortalResources.pricing_trafficManager),
-        description: this._ts.instant(PortalResources.pricing_trafficManagerDesc)
+        description: this._ts.instant(PortalResources.pricing_trafficManagerDesc),
     }];
 
     hardwareItems = [{
         iconUrl: 'image/app-service-plan.svg',
-        title: this._ts.instant(PortalResources.cpu),
-        description: this._ts.instant(PortalResources.pricing_dv2SeriesDedicatedCpu),
-        learnMoreUrl: Links.vmSizeLearnMore
+        title: this._ts.instant(PortalResources.pricing_includedHardware_azureComputeUnits),
+        description: this._ts.instant(PortalResources.pricing_computeDedicatedAcu),
+        learnMoreUrl: Links.azureComputeUnitLearnMore,
     },
     {
         iconUrl: 'image/website-power.svg',
         title: this._ts.instant(PortalResources.memory),
-        description: this._ts.instant(PortalResources.pricing_dedicatedMemory)
+        description: this._ts.instant(PortalResources.pricing_dedicatedMemory),
     },
     {
         iconUrl: 'image/storage.svg',
         title: this._ts.instant(PortalResources.storage),
-        description: this._ts.instant(PortalResources.pricing_sharedDisk).format('1 TB')
+        description: this._ts.instant(PortalResources.pricing_sharedDisk).format('1 TB'),
     }];
 
     cssClass = 'spec isolated-spec';
@@ -100,10 +100,9 @@ export class IsolatedSmallPlanPriceSpec extends IsolatedPlanPriceSpec {
     skuCode = 'I1';
     legacySkuName = 'small_isolated';
     topLevelFeatures = [
-        this._ts.instant(PortalResources.pricing_numCores).format('1x'),
         this._ts.instant(PortalResources.pricing_ACU).format('210'),
         this._ts.instant(PortalResources.pricing_memory).format('3.5'),
-        this._ts.instant(PortalResources.pricing_dSeriesCompute)
+        this._ts.instant(PortalResources.pricing_dSeriesComputeEquivalent),
     ];
 
     meterFriendlyName = 'Isolated Small App Service Hours';
@@ -121,10 +120,9 @@ export class IsolatedMediumPlanPriceSpec extends IsolatedPlanPriceSpec {
     skuCode = 'I2';
     legacySkuName = 'medium_isolated';
     topLevelFeatures = [
-        this._ts.instant(PortalResources.pricing_numCores).format('2x'),
         this._ts.instant(PortalResources.pricing_ACU).format('420'),
         this._ts.instant(PortalResources.pricing_memory).format('7'),
-        this._ts.instant(PortalResources.pricing_dSeriesCompute)
+        this._ts.instant(PortalResources.pricing_dSeriesComputeEquivalent),
     ];
 
     meterFriendlyName = 'Isolated Medium App Service Hours';
@@ -142,10 +140,9 @@ export class IsolatedLargePlanPriceSpec extends IsolatedPlanPriceSpec {
     skuCode = 'I3';
     legacySkuName = 'large_isolated';
     topLevelFeatures = [
-        this._ts.instant(PortalResources.pricing_numCores).format('4x'),
         this._ts.instant(PortalResources.pricing_ACU).format('840'),
         this._ts.instant(PortalResources.pricing_memory).format('14'),
-        this._ts.instant(PortalResources.pricing_dSeriesCompute)
+        this._ts.instant(PortalResources.pricing_dSeriesComputeEquivalent),
     ];
 
     meterFriendlyName = 'Isolated Large App Service Hours';

client/src/app/site/spec-picker/price-spec-manager/premium-container-plan-price-spec.ts

@@ -8,39 +8,39 @@ export abstract class PremiumContainerPlanPriceSpec extends PriceSpec {
     featureItems = [{
         iconUrl: 'image/ssl.svg',
         title: this._ts.instant(PortalResources.pricing_customDomainsSsl),
-        description: this._ts.instant(PortalResources.pricing_customDomainsIpSslDesc)
+        description: this._ts.instant(PortalResources.pricing_customDomainsIpSslDesc),
     },
     {
         iconUrl: 'image/scale-up.svg',
         title: this._ts.instant(PortalResources.pricing_autoScale),
-        description: this._ts.instant(PortalResources.pricing_scaleDesc).format(20)
+        description: this._ts.instant(PortalResources.pricing_scaleDesc).format(20),
     },
     {
         iconUrl: 'image/slots.svg',
         title: this._ts.instant(PortalResources.pricing_stagingSlots),
-        description: this._ts.instant(PortalResources.pricing_slotsDesc).format(20)
+        description: this._ts.instant(PortalResources.pricing_slotsDesc).format(20),
     },
     {
         iconUrl: 'image/globe.svg',
         title: this._ts.instant(PortalResources.pricing_trafficManager),
-        description: this._ts.instant(PortalResources.pricing_trafficManagerDesc)
+        description: this._ts.instant(PortalResources.pricing_trafficManagerDesc),
     }];
 
     hardwareItems = [{
         iconUrl: 'image/app-service-plan.svg',
-        title: this._ts.instant(PortalResources.cpu),
-        description: this._ts.instant(PortalResources.pricing_dv3SeriesDedicatedCpu),
-        learnMoreUrl: Links.vmSizeLearnMore
+        title: this._ts.instant(PortalResources.pricing_includedHardware_azureComputeUnits),
+        description: this._ts.instant(PortalResources.pricing_computeDedicatedAcu),
+        learnMoreUrl: Links.azureComputeUnitLearnMore,
     },
     {
         iconUrl: 'image/website-power.svg',
         title: this._ts.instant(PortalResources.memory),
-        description: this._ts.instant(PortalResources.pricing_dedicatedMemory)
+        description: this._ts.instant(PortalResources.pricing_dedicatedMemory),
     },
     {
         iconUrl: 'image/storage.svg',
         title: this._ts.instant(PortalResources.storage),
-        description: this._ts.instant(PortalResources.pricing_premiumContainerSharedDisk).format('250 GB')
+        description: this._ts.instant(PortalResources.pricing_premiumContainerSharedDisk).format('250 GB'),
     }];
 
     cssClass = 'spec premium-spec';
@@ -66,10 +66,9 @@ export class PremiumContainerSmallPriceSpec extends PremiumContainerPlanPriceSpe
     skuCode = 'PC2';
     legacySkuName = 'small_premium_container';
     topLevelFeatures = [
-        this._ts.instant(PortalResources.pricing_numCores).format('2x'),
         this._ts.instant(PortalResources.pricing_ACU).format('320'),
         this._ts.instant(PortalResources.pricing_memory).format('8'),
-        this._ts.instant(PortalResources.pricing_dv3SeriesCompute)
+        this._ts.instant(PortalResources.pricing_dv3SeriesComputeEquivalent),
     ];
 
     meterFriendlyName = 'Premium Container Small App Service Hours';
@@ -87,10 +86,9 @@ export class PremiumContainerMediumPriceSpec extends PremiumContainerPlanPriceSp
     skuCode = 'PC3';
     legacySkuName = 'medium_premium_container';
     topLevelFeatures = [
-        this._ts.instant(PortalResources.pricing_numCores).format('4x'),
         this._ts.instant(PortalResources.pricing_ACU).format('640'),
         this._ts.instant(PortalResources.pricing_memory).format('16'),
-        this._ts.instant(PortalResources.pricing_dv3SeriesCompute)
+        this._ts.instant(PortalResources.pricing_dv3SeriesComputeEquivalent),
     ];
 
     meterFriendlyName = 'Premium Container Medium App Service Hours';
@@ -108,10 +106,9 @@ export class PremiumContainerLargePriceSpec extends PremiumContainerPlanPriceSpe
     skuCode = 'PC4';
     legacySkuName = 'large_premium_container';
     topLevelFeatures = [
-        this._ts.instant(PortalResources.pricing_numCores).format('8x'),
         this._ts.instant(PortalResources.pricing_ACU).format('1280'),
         this._ts.instant(PortalResources.pricing_memory).format('32'),
-        this._ts.instant(PortalResources.pricing_dv3SeriesCompute)
+        this._ts.instant(PortalResources.pricing_dv3SeriesComputeEquivalent),
     ];
 
     meterFriendlyName = 'Premium Container Large App Service Hours';