diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index c8afbd78f388..db327c6d787b 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -717,144 +717,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -864,505 +727,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1505,706 +888,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2353,80 +1036,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2664,218 +1273,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2922,224 +1328,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3188,30 +1376,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Common/Commands.Common.Test/Properties/Resources.Designer.cs b/src/Common/Commands.Common.Test/Properties/Resources.Designer.cs index e4a20eaa2fb9..f3da5ecc0ad9 100644 --- a/src/Common/Commands.Common.Test/Properties/Resources.Designer.cs +++ b/src/Common/Commands.Common.Test/Properties/Resources.Designer.cs @@ -70,15 +70,6 @@ public static byte[] Azure { } } - /// - /// Looks up a localized string similar to http://az413943.vo.msecnd.net/cache/2.5.2.exe. - /// - public static string CacheRuntimeUrl { - get { - return ResourceManager.GetString("CacheRuntimeUrl", resourceCulture); - } - } - /// /// Looks up a localized resource of type System.Byte[]. /// diff --git a/src/Common/Commands.Common.Test/Properties/Resources.resx b/src/Common/Commands.Common.Test/Properties/Resources.resx index a3bbf003c590..ebf1d9dfbd53 100644 --- a/src/Common/Commands.Common.Test/Properties/Resources.resx +++ b/src/Common/Commands.Common.Test/Properties/Resources.resx @@ -121,9 +121,6 @@ ..\Resources\Azure.publishsettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - http://az413943.vo.msecnd.net/cache/2.5.2.exe - ..\Resources\InvalidProfile.PublishSettings;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/src/Common/Commands.Common/Common/ManagementConstants.cs b/src/Common/Commands.Common/Common/ManagementConstants.cs index 0de6c33ad716..08da1656a6bc 100644 --- a/src/Common/Commands.Common/Common/ManagementConstants.cs +++ b/src/Common/Commands.Common/Common/ManagementConstants.cs @@ -41,21 +41,6 @@ public static class ApiConstants } - public class SDKVersion - { - public const string Version180 = "1.8.0"; - - public const string Version200 = "2.0.0"; - - public const string Version220 = "2.2.0"; - - public const string Version230 = "2.3.0"; - - public const string Version240 = "2.4.0"; - - public const string Version250 = "2.5.0"; - } - public enum DevEnv { Local, diff --git a/src/Common/Commands.Common/Properties/Resources.Designer.cs b/src/Common/Commands.Common/Properties/Resources.Designer.cs index aadcee8cea7b..d3fef027128f 100644 --- a/src/Common/Commands.Common/Properties/Resources.Designer.cs +++ b/src/Common/Commands.Common/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.18449 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -249,52 +249,6 @@ public static string AzureDirectoryName { } } - /// - /// Looks up a localized string similar to Emulator. - /// - public static string AzureEmulatorDirectory { - get { - return ResourceManager.GetString("AzureEmulatorDirectory", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Azure Emulator is not installed and is required. - /// - public static string AzureEmulatorNotInstalledMessage { - get { - return ResourceManager.GetString("AzureEmulatorNotInstalledMessage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Azure Emulator\emulator. - /// - public static string AzureEmulatorPathPortion { - get { - return ResourceManager.GetString("AzureEmulatorPathPortion", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to SOFTWARE\Microsoft\Windows Azure Emulator. - /// - public static string AzureEmulatorRegistryKey { - get { - return ResourceManager.GetString("AzureEmulatorRegistryKey", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Azure service management error - ///{0}. - /// - public static string AzureException_WrapExistingError_DetailedErrorFormat { - get { - return ResourceManager.GetString("AzureException_WrapExistingError_DetailedErrorFormat", resourceCulture); - } - } - /// /// Looks up a localized string similar to https://manage.windowsazure.com. /// @@ -322,42 +276,6 @@ public static string AzureSdkDirectory { } } - /// - /// Looks up a localized string similar to InstallPath. - /// - public static string AzureSdkInstallPathRegistryKeyValue { - get { - return ResourceManager.GetString("AzureSdkInstallPathRegistryKeyValue", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to SOFTWARE\Microsoft\Microsoft SDKs\ServiceHosting. - /// - public static string AzureSdkRegistryKeyName { - get { - return ResourceManager.GetString("AzureSdkRegistryKeyName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The installed Azure SDK version is not supported. Make sure you version is between {0} and {1} inclusive. - /// - public static string AzureSdkVersionNotSupported { - get { - return ResourceManager.GetString("AzureSdkVersionNotSupported", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Azure Authoring Tools are not installed and are required. Installation of Azure SDK for .NET is recommended with Microsoft Web Platform Installer (PI) available at http://www.microsoft.com/web/downloads/platform.aspx.. - /// - public static string AzureToolsNotInstalledMessage { - get { - return ResourceManager.GetString("AzureToolsNotInstalledMessage", resourceCulture); - } - } - /// /// Looks up a localized string similar to Base Uri was empty.. /// @@ -412,60 +330,6 @@ public static string BlobEndpointUriEnv { } } - /// - /// Looks up a localized string similar to Memcache is already enabled for role '{0}'.. - /// - public static string CacheAlreadyEnabledMessage { - get { - return ResourceManager.GetString("CacheAlreadyEnabledMessage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to <configuration> - /// <configSections> - /// <section name="dataCacheClients" type="Microsoft.ApplicationServer.Caching.DataCacheClientsSection, Microsoft.ApplicationServer.Caching.Core" allowLocation="true" allowDefinition="Everywhere" /> - /// </configSections> - /// <dataCacheClients> - /// <tracing sinkType="DiagnosticSink" traceLevel="Error" /> - /// <dataCacheClient name="DefaultShimConfig" useLegacyProtocol="false"> - /// <autoDiscover isEnabled="true" identifier="$RoleName$" /> - /// </dataCacheClient> - /// </da [rest of string was truncated]";. - /// - public static string CacheAutoDiscoveryConfig { - get { - return ResourceManager.GetString("CacheAutoDiscoveryConfig", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Microsoft.WindowsAzure.Plugins.Caching.ClientDiagnosticLevel. - /// - public static string CacheClientDiagnosticLevelAssemblyName { - get { - return ResourceManager.GetString("CacheClientDiagnosticLevelAssemblyName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to DiagnosticStore. - /// - public static string CacheDiagnosticStoreName { - get { - return ResourceManager.GetString("CacheDiagnosticStoreName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Please upgrade the cache runtime of role '{0}' to '{1}' using Set-AzureServiceProjectRole -RoleName {0} -Runtime Cache -Version {1}. - /// - public static string CacheMismatchMessage { - get { - return ResourceManager.GetString("CacheMismatchMessage", resourceCulture); - } - } - /// /// Looks up a localized string similar to CACHERUNTIMEURL. /// @@ -493,24 +357,6 @@ public static string CacheRuntimeVersionKey { } } - /// - /// Looks up a localized string similar to Resources\Scaffolding\Cache. - /// - public static string CacheScaffolding { - get { - return ResourceManager.GetString("CacheScaffolding", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to setup_cache.cmd > cache_log.txt. - /// - public static string CacheStartupCommand { - get { - return ResourceManager.GetString("CacheStartupCommand", resourceCulture); - } - } - /// /// Looks up a localized string similar to Installing caching version {0} for Role '{1}' (the caching version locally installed is: {2}). /// @@ -520,42 +366,6 @@ public static string CacheVersionWarningText { } } - /// - /// Looks up a localized string similar to Microsoft.WindowsAzure.Plugins.Caching.CacheSizePercentage. - /// - public static string CachingCacheSizePercentageSettingName { - get { - return ResourceManager.GetString("CachingCacheSizePercentageSettingName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Microsoft.WindowsAzure.Plugins.Caching.ConfigStoreConnectionString. - /// - public static string CachingConfigStoreConnectionStringSettingName { - get { - return ResourceManager.GetString("CachingConfigStoreConnectionStringSettingName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1}. - /// - public static string CachingConfigStoreConnectionStringSettingValue { - get { - return ResourceManager.GetString("CachingConfigStoreConnectionStringSettingValue", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Caching. - /// - public static string CachingModuleName { - get { - return ResourceManager.GetString("CachingModuleName", resourceCulture); - } - } - /// /// Looks up a localized string similar to Cannot find {0} with name {1}.. /// @@ -1866,42 +1676,6 @@ public static string ManifestUri { } } - /// - /// Looks up a localized string similar to v2.5. - /// - public static string MaxSupportAzureSdkVersion { - get { - return ResourceManager.GetString("MaxSupportAzureSdkVersion", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to memcache_default. - /// - public static string MemcacheEndpointName { - get { - return ResourceManager.GetString("MemcacheEndpointName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to 11211. - /// - public static string MemcacheEndpointPort { - get { - return ResourceManager.GetString("MemcacheEndpointPort", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to v2.5. - /// - public static string MinSupportAzureSdkVersion { - get { - return ResourceManager.GetString("MinSupportAzureSdkVersion", resourceCulture); - } - } - /// /// Looks up a localized string similar to Python 2.7 is not installed. Please install it as well as Django 1.4.. /// diff --git a/src/Common/Commands.Common/Properties/Resources.resx b/src/Common/Commands.Common/Properties/Resources.resx index 9295f82d4c57..8374c78d8185 100644 --- a/src/Common/Commands.Common/Properties/Resources.resx +++ b/src/Common/Commands.Common/Properties/Resources.resx @@ -171,18 +171,6 @@ Windows Azure Powershell - - Emulator - - - Azure Emulator is not installed and is required - - - Azure Emulator\emulator - - - SOFTWARE\Microsoft\Windows Azure Emulator - https://manage.windowsazure.com @@ -192,22 +180,6 @@ Azure SDK\{0}\ - - InstallPath - - - SOFTWARE\Microsoft\Microsoft SDKs\ServiceHosting - - - The installed Azure SDK version is not supported. Make sure you version is between {0} and {1} inclusive - - - Azure service management error -{0} - - - Azure Authoring Tools are not installed and are required. Installation of Azure SDK for .NET is recommended with Microsoft Web Platform Installer (PI) available at http://www.microsoft.com/web/downloads/platform.aspx. - Base Uri was empty. WAPackIaaS @@ -227,31 +199,6 @@ AZURE_BLOBSTORAGE_TEMPLATE - - Memcache is already enabled for role '{0}'. - - - <configuration> - <configSections> - <section name="dataCacheClients" type="Microsoft.ApplicationServer.Caching.DataCacheClientsSection, Microsoft.ApplicationServer.Caching.Core" allowLocation="true" allowDefinition="Everywhere" /> - </configSections> - <dataCacheClients> - <tracing sinkType="DiagnosticSink" traceLevel="Error" /> - <dataCacheClient name="DefaultShimConfig" useLegacyProtocol="false"> - <autoDiscover isEnabled="true" identifier="$RoleName$" /> - </dataCacheClient> - </dataCacheClients> -</configuration> - - - Microsoft.WindowsAzure.Plugins.Caching.ClientDiagnosticLevel - - - DiagnosticStore - - - Please upgrade the cache runtime of role '{0}' to '{1}' using Set-AzureServiceProjectRole -RoleName {0} -Runtime Cache -Version {1} - CACHERUNTIMEURL @@ -261,27 +208,9 @@ CacheRuntimeVersion - - Resources\Scaffolding\Cache - - - setup_cache.cmd > cache_log.txt - Installing caching version {0} for Role '{1}' (the caching version locally installed is: {2}) - - Microsoft.WindowsAzure.Plugins.Caching.CacheSizePercentage - - - Microsoft.WindowsAzure.Plugins.Caching.ConfigStoreConnectionString - - - DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1} - - - Caching - Cannot find {0} with name {1}. @@ -716,18 +645,6 @@ Please follow these steps in the portal: http://az413943.vo.msecnd.net/node/runtimemanifest_0.7.5.2.xml - - v2.5 - - - memcache_default - - - 11211 - - - v2.5 - Python 2.7 is not installed. Please install it as well as Django 1.4. diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs index ead84c2be6ca..79f496cc8b15 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs @@ -120,36 +120,5 @@ public void TestCreatePackageWithMultipleRolesSuccessfull() Assert.True(File.Exists(packagePath)); } } - - [Fact] - public void ThrowsErrorForInvalidCacheVersion() - { - using (FileSystemHelper files = new FileSystemHelper(this)) - { - files.CreateAzureSdkDirectoryAndImportPublishSettings(); - files.CreateNewService("NEW_SERVICE"); - string rootPath = Path.Combine(files.RootPath, "NEW_SERVICE"); - string packagePath = Path.Combine(rootPath, Resources.CloudPackageFileName); - string cacheRoleName = "WorkerRole1"; - AddAzureCacheWorkerRoleCommand addCacheWorkerCmdlet = new AddAzureCacheWorkerRoleCommand() - { - CommandRuntime = mockCommandRuntime - }; - EnableAzureMemcacheRoleCommand enableCacheCmdlet = new EnableAzureMemcacheRoleCommand() - { - CacheRuntimeVersion = "1.8.0", - CommandRuntime = mockCommandRuntime - }; - - CloudServiceProject service = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath("Services")); - service.AddWebRole(Test.Utilities.Common.Data.NodeWebRoleScaffoldingPath); - addCacheWorkerCmdlet.AddAzureCacheWorkerRoleProcess(cacheRoleName, 1, rootPath); - enableCacheCmdlet.EnableAzureMemcacheRoleProcess("WebRole1", cacheRoleName, rootPath); - - Testing.AssertThrows( - () => cmdlet.ExecuteCmdlet(), - string.Format(Resources.CacheMismatchMessage, "WebRole1", "2.5.0")); - } - } } } diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/Scaffolding/AddAzureCacheWorkerRoleTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/Scaffolding/AddAzureCacheWorkerRoleTests.cs deleted file mode 100644 index 1ed81dfc23b6..000000000000 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/Scaffolding/AddAzureCacheWorkerRoleTests.cs +++ /dev/null @@ -1,125 +0,0 @@ -// ---------------------------------------------------------------------------------- -// -// Copyright Microsoft Corporation -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// ---------------------------------------------------------------------------------- - -using System; -using System.IO; -using System.Management.Automation; -using Xunit; -using Microsoft.WindowsAzure.Commands.CloudService.Development.Scaffolding; -using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; -using Microsoft.WindowsAzure.Commands.Utilities.CloudService; -using Microsoft.WindowsAzure.Commands.Utilities.CloudService.AzureTools; -using Microsoft.WindowsAzure.Commands.Utilities.Common; -using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; -using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema; -using Microsoft.WindowsAzure.Commands.Utilities.Properties; - -namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Development.Scaffolding -{ - using ConfigConfigurationSetting = Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema.ConfigurationSetting; - using Microsoft.WindowsAzure.Commands.Common; - - - public class AddAzureCacheWorkerRoleTests : TestBase - { - private MockCommandRuntime mockCommandRuntime; - - private NewAzureServiceProjectCommand newServiceCmdlet; - - private AddAzureCacheWorkerRoleCommand addCacheRoleCmdlet; - - public AddAzureCacheWorkerRoleTests() - { - AzureTool.IgnoreMissingSDKError = true; - AzurePowerShell.ProfileDirectory = Test.Utilities.Common.Data.AzureSdkAppDir; - mockCommandRuntime = new MockCommandRuntime(); - - newServiceCmdlet = new NewAzureServiceProjectCommand(); - addCacheRoleCmdlet = new AddAzureCacheWorkerRoleCommand(); - - newServiceCmdlet.CommandRuntime = mockCommandRuntime; - addCacheRoleCmdlet.CommandRuntime = mockCommandRuntime; - } - - [Fact] - public void AddNewCacheWorkerRoleSuccessful() - { - using (FileSystemHelper files = new FileSystemHelper(this)) - { - string rootPath = Path.Combine(files.RootPath, "AzureService"); - string roleName = "WorkerRole"; - int expectedInstanceCount = 10; - newServiceCmdlet.NewAzureServiceProcess(files.RootPath, "AzureService"); - WorkerRole cacheWorkerRole = addCacheRoleCmdlet.AddAzureCacheWorkerRoleProcess(roleName, expectedInstanceCount, rootPath); - - AzureAssert.ScaffoldingExists(Path.Combine(files.RootPath, "AzureService", "WorkerRole"), Path.Combine(Resources.GeneralScaffolding, Resources.WorkerRole)); - - AzureAssert.WorkerRoleImportsExists(new Import { moduleName = Resources.CachingModuleName }, cacheWorkerRole); - - AzureAssert.LocalResourcesLocalStoreExists(new LocalStore { name = Resources.CacheDiagnosticStoreName, cleanOnRoleRecycle = false }, - cacheWorkerRole.LocalResources); - - Assert.Null(cacheWorkerRole.Endpoints.InputEndpoint); - - AssertConfigExists(AzureAssert.GetCloudRole(rootPath, roleName)); - AssertConfigExists(AzureAssert.GetLocalRole(rootPath, roleName), Resources.EmulatorConnectionString); - - PSObject actualOutput = mockCommandRuntime.OutputPipeline[1] as PSObject; - Assert.Equal(roleName, actualOutput.Members[Parameters.CacheWorkerRoleName].Value.ToString()); - Assert.Equal(expectedInstanceCount, int.Parse(actualOutput.Members[Parameters.Instances].Value.ToString())); - } - } - - private static void AssertConfigExists(RoleSettings role, string connectionString = "") - { - AzureAssert.ConfigurationSettingExist(new ConfigConfigurationSetting { name = Resources.NamedCacheSettingName, value = Resources.NamedCacheSettingValue }, role.ConfigurationSettings); - AzureAssert.ConfigurationSettingExist(new ConfigConfigurationSetting { name = Resources.DiagnosticLevelName, value = Resources.DiagnosticLevelValue }, role.ConfigurationSettings); - AzureAssert.ConfigurationSettingExist(new ConfigConfigurationSetting { name = Resources.CachingCacheSizePercentageSettingName, value = string.Empty }, role.ConfigurationSettings); - AzureAssert.ConfigurationSettingExist(new ConfigConfigurationSetting { name = Resources.CachingConfigStoreConnectionStringSettingName, value = connectionString }, role.ConfigurationSettings); - } - - [Fact] - public void AddNewCacheWorkerRoleWithInvalidNamesFail() - { - using (FileSystemHelper files = new FileSystemHelper(this)) - { - string rootPath = Path.Combine(files.RootPath, "AzureService"); - newServiceCmdlet.NewAzureServiceProcess(files.RootPath, "AzureService"); - - foreach (string invalidName in Test.Utilities.Common.Data.InvalidRoleNames) - { - Testing.AssertThrows(() => addCacheRoleCmdlet.AddAzureCacheWorkerRoleProcess(invalidName, 1, rootPath)); - } - } - } - - [Fact] - public void AddNewCacheWorkerRoleDoesNotHaveAnyRuntime() - { - using (FileSystemHelper files = new FileSystemHelper(this)) - { - string rootPath = Path.Combine(files.RootPath, "AzureService"); - string roleName = "WorkerRole"; - int expectedInstanceCount = 10; - newServiceCmdlet.NewAzureServiceProcess(files.RootPath, "AzureService"); - - WorkerRole cacheWorkerRole = addCacheRoleCmdlet.AddAzureCacheWorkerRoleProcess(roleName, expectedInstanceCount, rootPath); - - Variable runtimeId = Array.Find(cacheWorkerRole.Startup.Task[0].Environment, v => v.name.Equals(Resources.RuntimeTypeKey)); - Assert.Equal(string.Empty, runtimeId.value); - } - } - } -} diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs index 40c618e12f2a..080d934d64c0 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs @@ -40,10 +40,6 @@ public class AzureServiceTests: TestBase private AddAzureNodeWorkerRoleCommand addNodeWorkerCmdlet; - private AddAzureCacheWorkerRoleCommand addCacheRoleCmdlet; - - private EnableAzureMemcacheRoleCommand enableCacheCmdlet; - /// /// This method handles most possible cases that user can do to create role /// @@ -195,12 +191,6 @@ public AzureServiceTests() AzureTool.IgnoreMissingSDKError = true; AzurePowerShell.ProfileDirectory = Test.Utilities.Common.Data.AzureSdkAppDir; mockCommandRuntime = new MockCommandRuntime(); - - enableCacheCmdlet = new EnableAzureMemcacheRoleCommand(); - addCacheRoleCmdlet = new AddAzureCacheWorkerRoleCommand(); - - addCacheRoleCmdlet.CommandRuntime = mockCommandRuntime; - enableCacheCmdlet.CommandRuntime = mockCommandRuntime; } [Fact] @@ -565,9 +555,8 @@ public void TestResolveRuntimePackageUrls() addNodeWorkerCmdlet = new AddAzureNodeWorkerRoleCommand() { RootPath = rootPath, CommandRuntime = mockCommandRuntime, Name = overrideWorkerRoleName, Instances = 2 }; addNodeWorkerCmdlet.ExecuteCmdlet(); - string cacheWebRoleName = "cacheWebRole"; - string cacheRuntimeVersion = "1.7.0"; - AddAzureNodeWebRoleCommand addAzureWebRole = new AddAzureNodeWebRoleCommand() { RootPath = rootPath, CommandRuntime = mockCommandRuntime, Name = cacheWebRoleName }; + string webRole2Name = "WebRole2"; + AddAzureNodeWebRoleCommand addAzureWebRole = new AddAzureNodeWebRoleCommand() { RootPath = rootPath, CommandRuntime = mockCommandRuntime, Name = webRole2Name }; addAzureWebRole.ExecuteCmdlet(); CloudServiceProject testService = new CloudServiceProject(rootPath, FileUtilities.GetContentFilePath("Services")); @@ -575,7 +564,18 @@ public void TestResolveRuntimePackageUrls() RuntimePackageHelper.SetRoleRuntime(testService.Components.Definition, matchWorkerRoleName, testService.Paths, version: "0.8.2"); RuntimePackageHelper.SetRoleRuntime(testService.Components.Definition, overrideWebRoleName, testService.Paths, overrideUrl: "http://OVERRIDE"); RuntimePackageHelper.SetRoleRuntime(testService.Components.Definition, overrideWorkerRoleName, testService.Paths, overrideUrl: "http://OVERRIDE"); - testService.AddRoleRuntime(testService.Paths, cacheWebRoleName, Resources.CacheRuntimeValue, cacheRuntimeVersion, RuntimePackageHelper.GetTestManifest(files)); + + bool exceptionWasThrownOnSettingCacheRole = false; + try + { + string cacheRuntimeVersion = "1.7.0"; + testService.AddRoleRuntime(testService.Paths, webRole2Name, Resources.CacheRuntimeValue, cacheRuntimeVersion, RuntimePackageHelper.GetTestManifest(files)); + } + catch (NotSupportedException) + { + exceptionWasThrownOnSettingCacheRole = true; + } + Assert.True(exceptionWasThrownOnSettingCacheRole); testService.Components.Save(testService.Paths); // Get the publishing process started by creating the package @@ -589,7 +589,6 @@ public void TestResolveRuntimePackageUrls() RuntimePackageHelper.ValidateRoleRuntime(updatedService.Components.Definition, matchWebRoleName, "http://cdn/node/foo.exe;http://cdn/iisnode/default.exe", null); RuntimePackageHelper.ValidateRoleRuntime(updatedService.Components.Definition, overrideWebRoleName, null, "http://OVERRIDE"); RuntimePackageHelper.ValidateRoleRuntime(updatedService.Components.Definition, overrideWorkerRoleName, null, "http://OVERRIDE"); - RuntimePackageHelper.ValidateRoleRuntimeVariable(updatedService.Components.GetRoleStartup(cacheWebRoleName), Resources.CacheRuntimeVersionKey, cacheRuntimeVersion); } } } diff --git a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj index 6c0ceb9f26fe..9ef3703a3c36 100644 --- a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj +++ b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj @@ -171,11 +171,9 @@ - - diff --git a/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj b/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj index 799e0157b5bb..b78ec2a96922 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj +++ b/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj @@ -197,7 +197,6 @@ - @@ -211,6 +210,7 @@ + @@ -438,14 +438,6 @@ PreserveNewest - - Designer - PreserveNewest - - - Designer - PreserveNewest - MSBuild:Compile Designer @@ -492,15 +484,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/AzureSdkVersionInfo.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/AzureSdkVersionInfo.cs new file mode 100644 index 000000000000..1fd5fd054552 --- /dev/null +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/AzureSdkVersionInfo.cs @@ -0,0 +1,24 @@ +// ---------------------------------------------------------------------------------- +// +// Copyright Microsoft Corporation +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// ---------------------------------------------------------------------------------- + +namespace Microsoft.WindowsAzure.Commands.Utilities.Common.AzureTools +{ + internal class AzureSdkVersionInfo + { + //When intergrate with new Azure SDK, please update the versions here. + //If you find there are other version strings to update, please move them to here. + public const string SupportAzureSdkVersionRegKey = "v2.5"; + public const string SupportAzureSdkVersion = "2.5.0"; + } +} diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/AzureTool.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/AzureTool.cs index 24be5e295970..c0554ab1db43 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/AzureTool.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/AzureTool.cs @@ -17,12 +17,15 @@ using System.IO; using System.Linq; using Microsoft.Win32; -using Microsoft.WindowsAzure.Commands.Common.Properties; +using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.WindowsAzure.Commands.Utilities.Common.AzureTools; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService.AzureTools { public class AzureTool { + public const string SupportAzureSdkVersion = "2.5.0"; + public static void Validate() { // This instantiation will throw if user is running with incompatible Microsoft Azure SDK version. @@ -82,9 +85,7 @@ public static string GetStorageEmulatorDirectory() private static string GetSdkVersionRegistryValue() { - string version = string.Empty; - string min = Resources.MinSupportAzureSdkVersion; - string max = Resources.MaxSupportAzureSdkVersion; + string version = string.Empty; try { using (RegistryKey key = Registry.LocalMachine.OpenSubKey(Resources.AzureSdkRegistryKeyName)) @@ -93,13 +94,11 @@ private static string GetSdkVersionRegistryValue() { throw new InvalidOperationException(Resources.AzureToolsNotInstalledMessage); } - version = key.GetSubKeyNames() - .Where(n => (n.CompareTo(min) == 1 && n.CompareTo(max) == -1) || n.CompareTo(min) == 0 || n.CompareTo(max) == 0) - .Max(); + version = key.GetSubKeyNames().FirstOrDefault(n => n == AzureSdkVersionInfo.SupportAzureSdkVersionRegKey); if (string.IsNullOrEmpty(version) && key.GetSubKeyNames().Length > 0) { - throw new InvalidOperationException(string.Format(Resources.AzureSdkVersionNotSupported, min, max)); + throw new InvalidOperationException(string.Format(Resources.AzureSdkVersionNotSupported, AzureSdkVersionInfo.SupportAzureSdkVersionRegKey)); } else if (string.IsNullOrEmpty(version) && key.GetSubKeyNames().Length == 0) { @@ -109,10 +108,9 @@ private static string GetSdkVersionRegistryValue() } catch (InvalidOperationException) { - //temporary workaround: catch exception and fall back to v2.5 if (IgnoreMissingSDKError) { - version = "v2.5"; + version = AzureSdkVersionInfo.SupportAzureSdkVersionRegKey; } else { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntime.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntime.cs index 10f309b6141f..a72fcccfd035 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntime.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntime.cs @@ -90,8 +90,8 @@ private static CloudRuntime CreateRuntimeInternal(RuntimeType runtimeType, strin runtime = new NullCloudRuntime(); break; case RuntimeType.Cache: - runtime = new CacheCloudRuntime(); - break; + //Scaffolding for cache is no longer supported + throw new NotSupportedException(Resources.CacheScaffoldingIsNotSupport); case RuntimeType.PHP: runtime = new PHPCloudRuntime(); break; @@ -539,83 +539,6 @@ protected override void ApplyScaffoldingChanges(CloudRuntimePackage package) } } - private class CacheCloudRuntime : CloudRuntime - { - protected override void Configure(Dictionary environment) - { - if (string.IsNullOrEmpty(this.Version)) - { - string version; - if (!environment.TryGetValue(Resources.CacheRuntimeVersionKey, out version)) - { - version = AzureTool.GetAzureSdkVersion(); - } - - this.Version = version; - } - } - - public override bool Match(CloudRuntimePackage runtime) - { - return this.Version.Equals(runtime.Version, StringComparison.OrdinalIgnoreCase); - } - - protected override string GenerateWarningText(CloudRuntimePackage package) - { - return string.Format(Resources.CacheVersionWarningText, package.Version, this.RoleName, - this.Version); - } - - protected override bool GetChanges(CloudRuntimePackage package, out Dictionary changes) - { - base.GetChanges(package, out changes); - - Debug.Assert(changes.ContainsKey(Resources.RuntimeTypeKey), "Cache runtime should be added before calling this method"); - Debug.Assert(changes.ContainsKey(Resources.RuntimeUrlKey), "Cache runtime should be added before calling this method"); - - changes[Resources.CacheRuntimeVersionKey] = package.Version; - - return true; - } - - protected override void ApplyScaffoldingChanges(CloudRuntimePackage package) - { - string rootPath = CommonUtilities.GetServiceRootPath(FilePath); - - if (CloudServiceProject.Components.StartupTaskExists(RoleName, Resources.CacheStartupCommand)) - { - CloudServiceProject.Components.SetStartupTaskVariable( - RoleName, - Resources.CacheRuntimeUrl, - package.PackageUri.ToString(), - Resources.CacheStartupCommand); - } - else - { - Variable emulated = new Variable - { - name = Resources.EmulatedKey, - RoleInstanceValue = new RoleInstanceValueElement - { - xpath = "/RoleEnvironment/Deployment/@emulated" - } - }; - Variable cacheRuntimeUrl = new Variable - { - name = Resources.CacheRuntimeUrl, - value = package.PackageUri.ToString() - }; - - CloudServiceProject.Components.AddStartupTask( - RoleName, - Resources.CacheStartupCommand, - ExecutionContext.elevated, - emulated, - cacheRuntimeUrl); - } - } - } - private class NullCloudRuntime : CloudRuntime { public override bool Match(CloudRuntimePackage runtime) diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntimeCollection.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntimeCollection.cs index 9b853562becf..717b5403885b 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntimeCollection.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntimeCollection.cs @@ -206,17 +206,6 @@ protected virtual void Dispose(bool disposing) } } } - - public static string GetRuntimeUrl(string runtimeType, string runtimeVersion, string manifest = null) - { - CloudRuntimeCollection collection; - CloudRuntimeCollection.CreateCloudRuntimeCollection(out collection, manifest); - CloudRuntime desiredRuntime = CloudRuntime.CreateCloudRuntime(runtimeType, runtimeVersion, null, null); - CloudRuntimePackage foundPackage; - bool found = collection.TryFindMatch(desiredRuntime, out foundPackage); - - return found ? foundPackage.PackageUri.AbsoluteUri : null; - } } class VersionComparer : IComparer diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudServiceProject.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudServiceProject.cs index ffd12d3e6550..48dd6a294e94 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudServiceProject.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudServiceProject.cs @@ -20,13 +20,13 @@ using System.Security.Permissions; using System.Security.Principal; using System.Text; +using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.CloudService.AzureTools; using Microsoft.WindowsAzure.Commands.Utilities.CloudService.Scaffolding; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema; using Microsoft.WindowsAzure.Commands.Utilities; -using Microsoft.WindowsAzure.Commands.Common; using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService @@ -306,9 +306,8 @@ public void CreatePackage(DevEnv type) private void VerifyCloudServiceProjectComponents() { - const string CacheVersion = "2.5.0"; + string CacheVersion = AzureTool.SupportAzureSdkVersion; - // Verify caching version is 2.2 foreach (string roleName in Components.GetRoles()) { string value = Components.GetStartupTaskVariable( @@ -319,7 +318,7 @@ private void VerifyCloudServiceProjectComponents() if (!string.IsNullOrEmpty(value) && !string.Equals(value, CacheVersion, StringComparison.OrdinalIgnoreCase)) { - throw new Exception(string.Format(Resources.CacheMismatchMessage, roleName, CacheVersion)); + throw new Exception(string.Format(Microsoft.WindowsAzure.Commands.Utilities.Properties.Resources.CacheMismatchMessage, roleName, CacheVersion)); } } } diff --git a/src/ServiceManagement/Services/Commands.Utilities/Properties/Resources.Designer.cs b/src/ServiceManagement/Services/Commands.Utilities/Properties/Resources.Designer.cs index d2c6a3cc7b53..9d5583905102 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Properties/Resources.Designer.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.18449 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -267,15 +267,6 @@ public static string AzureEmulatorNotRunningElevetaed { } } - /// - /// Looks up a localized string similar to Azure Emulator\emulator. - /// - public static string AzureEmulatorPathPortion { - get { - return ResourceManager.GetString("AzureEmulatorPathPortion", resourceCulture); - } - } - /// /// Looks up a localized string similar to SOFTWARE\Microsoft\Windows Azure Emulator. /// @@ -285,16 +276,6 @@ public static string AzureEmulatorRegistryKey { } } - /// - /// Looks up a localized string similar to Azure service management error - ///{0}. - /// - public static string AzureException_WrapExistingError_DetailedErrorFormat { - get { - return ResourceManager.GetString("AzureException_WrapExistingError_DetailedErrorFormat", resourceCulture); - } - } - /// /// Looks up a localized string similar to https://manage.windowsazure.com. /// @@ -350,7 +331,7 @@ public static string AzureSdkRegistryKeyName { } /// - /// Looks up a localized string similar to The installed Azure SDK version is not supported. Make sure you version is between {0} and {1} inclusive. + /// Looks up a localized string similar to The installed Azure SDK version is not supported. Make sure you version is {0}. /// public static string AzureSdkVersionNotSupported { get { @@ -422,52 +403,7 @@ public static string BlobEndpointUriEnv { } /// - /// Looks up a localized string similar to Memcache is already enabled for role '{0}'.. - /// - public static string CacheAlreadyEnabledMessage { - get { - return ResourceManager.GetString("CacheAlreadyEnabledMessage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to <configuration> - /// <configSections> - /// <section name="dataCacheClients" type="Microsoft.ApplicationServer.Caching.DataCacheClientsSection, Microsoft.ApplicationServer.Caching.Core" allowLocation="true" allowDefinition="Everywhere" /> - /// </configSections> - /// <dataCacheClients> - /// <tracing sinkType="DiagnosticSink" traceLevel="Error" /> - /// <dataCacheClient name="DefaultShimConfig" useLegacyProtocol="false"> - /// <autoDiscover isEnabled="true" identifier="$RoleName$" /> - /// </dataCacheClient> - /// </da [rest of string was truncated]";. - /// - public static string CacheAutoDiscoveryConfig { - get { - return ResourceManager.GetString("CacheAutoDiscoveryConfig", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Microsoft.WindowsAzure.Plugins.Caching.ClientDiagnosticLevel. - /// - public static string CacheClientDiagnosticLevelAssemblyName { - get { - return ResourceManager.GetString("CacheClientDiagnosticLevelAssemblyName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to DiagnosticStore. - /// - public static string CacheDiagnosticStoreName { - get { - return ResourceManager.GetString("CacheDiagnosticStoreName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Please upgrade the cache runtime of role '{0}' to '{1}' using Set-AzureServiceProjectRole -RoleName {0} -Runtime Cache -Version {1}. + /// Looks up a localized string similar to Your ServiceDefinition.csdef uses the cache runtime of role '{0}' which might not work correctly with '{1}' . /// public static string CacheMismatchMessage { get { @@ -503,20 +439,11 @@ public static string CacheRuntimeVersionKey { } /// - /// Looks up a localized string similar to Resources\Scaffolding\Cache. - /// - public static string CacheScaffolding { - get { - return ResourceManager.GetString("CacheScaffolding", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to setup_cache.cmd > cache_log.txt. + /// Looks up a localized string similar to Scaffolding for Cache Role is not supported any more.. /// - public static string CacheStartupCommand { + public static string CacheScaffoldingIsNotSupport { get { - return ResourceManager.GetString("CacheStartupCommand", resourceCulture); + return ResourceManager.GetString("CacheScaffoldingIsNotSupport", resourceCulture); } } @@ -529,15 +456,6 @@ public static string CacheVersionWarningText { } } - /// - /// Looks up a localized string similar to Microsoft.WindowsAzure.Plugins.Caching.CacheSizePercentage. - /// - public static string CachingCacheSizePercentageSettingName { - get { - return ResourceManager.GetString("CachingCacheSizePercentageSettingName", resourceCulture); - } - } - /// /// Looks up a localized string similar to Microsoft.WindowsAzure.Plugins.Caching.ConfigStoreConnectionString. /// @@ -547,24 +465,6 @@ public static string CachingConfigStoreConnectionStringSettingName { } } - /// - /// Looks up a localized string similar to DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1}. - /// - public static string CachingConfigStoreConnectionStringSettingValue { - get { - return ResourceManager.GetString("CachingConfigStoreConnectionStringSettingValue", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Caching. - /// - public static string CachingModuleName { - get { - return ResourceManager.GetString("CachingModuleName", resourceCulture); - } - } - /// /// Looks up a localized string similar to Cannot find {0} with name {1}.. /// @@ -2101,42 +2001,6 @@ public static string MarketplaceEndpoint { } } - /// - /// Looks up a localized string similar to v2.5. - /// - public static string MaxSupportAzureSdkVersion { - get { - return ResourceManager.GetString("MaxSupportAzureSdkVersion", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to memcache_default. - /// - public static string MemcacheEndpointName { - get { - return ResourceManager.GetString("MemcacheEndpointName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to 11211. - /// - public static string MemcacheEndpointPort { - get { - return ResourceManager.GetString("MemcacheEndpointPort", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to v2.5. - /// - public static string MinSupportAzureSdkVersion { - get { - return ResourceManager.GetString("MinSupportAzureSdkVersion", resourceCulture); - } - } - /// /// Looks up a localized string similar to Python 2.7 is not installed. Please install it as well as Django 1.4.. /// diff --git a/src/ServiceManagement/Services/Commands.Utilities/Properties/Resources.resx b/src/ServiceManagement/Services/Commands.Utilities/Properties/Resources.resx index 3cea1ec63e68..dac9fb83dd78 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Properties/Resources.resx +++ b/src/ServiceManagement/Services/Commands.Utilities/Properties/Resources.resx @@ -183,9 +183,6 @@ You must run PowerShell from an elevated PowerShell window to use the Azure Emulator. Please restart your PowerShell window as an administrator. - - Azure Emulator\emulator - SOFTWARE\Microsoft\Windows Azure Emulator @@ -208,11 +205,7 @@ SOFTWARE\Microsoft\Microsoft SDKs\ServiceHosting - The installed Azure SDK version is not supported. Make sure you version is between {0} and {1} inclusive - - - Azure service management error -{0} + The installed Azure SDK version is not supported. Make sure you version is {0} Azure Authoring Tools are not installed and are required @@ -236,30 +229,11 @@ AZURE_BLOBSTORAGE_TEMPLATE - - Memcache is already enabled for role '{0}'. - - - <configuration> - <configSections> - <section name="dataCacheClients" type="Microsoft.ApplicationServer.Caching.DataCacheClientsSection, Microsoft.ApplicationServer.Caching.Core" allowLocation="true" allowDefinition="Everywhere" /> - </configSections> - <dataCacheClients> - <tracing sinkType="DiagnosticSink" traceLevel="Error" /> - <dataCacheClient name="DefaultShimConfig" useLegacyProtocol="false"> - <autoDiscover isEnabled="true" identifier="$RoleName$" /> - </dataCacheClient> - </dataCacheClients> -</configuration> - - - Microsoft.WindowsAzure.Plugins.Caching.ClientDiagnosticLevel - - - DiagnosticStore - - Please upgrade the cache runtime of role '{0}' to '{1}' using Set-AzureServiceProjectRole -RoleName {0} -Runtime Cache -Version {1} + Your ServiceDefinition.csdef uses the cache runtime of role '{0}' which might not work correctly with '{1}' + + + Scaffolding for Cache Role is not supported any more. CACHERUNTIMEURL @@ -270,27 +244,12 @@ CacheRuntimeVersion - - Resources\Scaffolding\Cache - - - setup_cache.cmd > cache_log.txt - Installing caching version {0} for Role '{1}' (the caching version locally installed is: {2}) - - Microsoft.WindowsAzure.Plugins.Caching.CacheSizePercentage - Microsoft.WindowsAzure.Plugins.Caching.ConfigStoreConnectionString - - DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1} - - - Caching - Cannot find {0} with name {1}. @@ -792,18 +751,6 @@ Please follow these steps in the portal: http://api.datamarket.azure.com/CatalogService.svc - - v2.5 - - - memcache_default - - - 11211 - - - v2.5 - Python 2.7 is not installed. Please install it as well as Django 1.4. diff --git a/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WebRole/Scaffold.xml b/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WebRole/Scaffold.xml deleted file mode 100644 index 53e4d35bd023..000000000000 --- a/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WebRole/Scaffold.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WebRole/bin/setup_cache.cmd b/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WebRole/bin/setup_cache.cmd deleted file mode 100644 index 07556ecc6eab..000000000000 --- a/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WebRole/bin/setup_cache.cmd +++ /dev/null @@ -1,23 +0,0 @@ -@echo on -cd /d "%~dp0" - -if "%EMULATED%"=="true" goto setup_emulator - -:start_cache -WindowsAzure.Caching.MemcacheShim\ClientPerfCountersInstaller.exe install -WindowsAzure.Caching.MemcacheShim\MemcacheShimInstaller.exe -if %ERRORLEVEL% neq 0 goto error - -echo SUCCESS -exit /b 0 - -:setup_emulator -echo Downloading and installing cache runtime -powershell .\download.ps1 '%CACHERUNTIMEURL%' -if %ERRORLEVEL% neq 0 goto error - -goto start_cache - -:error -echo FAILED -exit /b -1 \ No newline at end of file diff --git a/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WorkerRole/Scaffold.xml b/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WorkerRole/Scaffold.xml deleted file mode 100644 index c0f813bbfd65..000000000000 --- a/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WorkerRole/Scaffold.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WorkerRole/setup_cache.cmd b/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WorkerRole/setup_cache.cmd deleted file mode 100644 index 37685c2df2e8..000000000000 --- a/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WorkerRole/setup_cache.cmd +++ /dev/null @@ -1,23 +0,0 @@ -@echo on -cd /d "%~dp0" - -if "%EMULATED%"=="true" goto setup_emulator - -:start_cache -bin\WindowsAzure.Caching.MemcacheShim\ClientPerfCountersInstaller.exe install -bin\WindowsAzure.Caching.MemcacheShim\MemcacheShimInstaller.exe -if %ERRORLEVEL% neq 0 goto error - -echo SUCCESS -exit /b 0 - -:setup_emulator -echo Downloading and installing cache runtime -powershell .\download.ps1 '%CACHERUNTIMEURL%' -if %ERRORLEVEL% neq 0 goto error - -goto start_cache - -:error -echo FAILED -exit /b -1 \ No newline at end of file diff --git a/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WorkerRole/web.config b/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WorkerRole/web.config deleted file mode 100644 index 1d39964e6d65..000000000000 --- a/src/ServiceManagement/Services/Commands.Utilities/Resources/Scaffolding/Cache/WorkerRole/web.config +++ /dev/null @@ -1,23 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ServiceManagement/Services/Commands/Commands.csproj b/src/ServiceManagement/Services/Commands/Commands.csproj index 263cf2e345c9..a2f63194e6b5 100644 --- a/src/ServiceManagement/Services/Commands/Commands.csproj +++ b/src/ServiceManagement/Services/Commands/Commands.csproj @@ -194,11 +194,9 @@ - - diff --git a/tools/VerifyAzureSDK.ps1 b/tools/VerifyAzureSDK.ps1 index 348ae07e86c2..f4a1afccfd9a 100644 --- a/tools/VerifyAzureSDK.ps1 +++ b/tools/VerifyAzureSDK.ps1 @@ -8,34 +8,11 @@ Write-Host "**Node.js for Windows (32-bits) at http://nodejs.org/download/ and A Write-Host "**Azure PHP for Windows at http://azure.microsoft.com/en-us/downloads/." -ForegroundColor "Yellow" Write-Host "**It is recommended to reboot the machine after the setup, or at least relaunch the powershell." -ForegroundColor "Red" -Write-Host "Testing Caching role with MemCacheShim package, Node Web Role, and run under emulators" -ForegroundColor "Green" -#detect nodejs for x86 is installed, if not install it - # create testing folder $testFolder = "$env:AzurePSRoot\src\Package\" + [System.IO.Path]::GetRandomFileName() md $testFolder cd $testFolder -New-AzureServiceProject Cache -# the 'ClientRole' is coupled with the client script, do not change it unless you update the script as well -Add-AzureNodeWebRole ClientRole -Add-AzureCacheWorkerRole CacheRole -Enable-AzureMemcacheRole ClientRole CacheRole - -md "temp" -Copy-Item "$env:AzurePSRoot\src\Common\Commands.ScenarioTest\Resources\CloudService\Cache\*.js" ".\ClientRole\" -Force -Recurse -cd "$testFolder\Cache\ClientRole" -Start-Process "npm" "install $env:AzurePSRoot\src\Common\Commands.ScenarioTest\Resources\CloudService\Cache\mc.tgz $env:AzurePSRoot\src\Common\Commands.ScenarioTest\Resources\CloudService\Cache\connman.tgz" -Wait - -cd "$testFolder\Cache" -Start-AzureEmulator -v - -Write-Host "You can do some testing by loading role url in the browser and adding some key/value to mem cache emulators" -ForegroundColor "Yellow" -Write-Host "Press any key to continue to the next testing" -$keyPressed = $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown") - -Write-Host "Testing PHP web & worker roles with emulator" -ForegroundColor "Green" -cd $testFolder New-AzureServiceProject PHPTest Add-AzurePHPWebRole Add-AzurePHPWorkerRole