Merge pull request #364 from Azure/dev

HPF PR: dev <- Azure:dev

Author: huangpf

src/Common/Commands.Common/ProfileClient.cs

@@ -841,6 +841,9 @@ private AzureSubscription MergeSubscriptionProperties(AzureSubscription subscrip
                 Id = subscription1.Id,
                 Name = subscription1.Name,
                 Environment = subscription1.Environment,
+                State = (subscription1.State != null &&
+                         subscription1.State.Equals(subscription2.State, StringComparison.OrdinalIgnoreCase)) ? 
+                        subscription1.State: null,
                 Account = subscription1.Account ?? subscription2.Account
             };
 

src/ResourceManager/Profile/Commands.Profile/Context/SetAzureRMContext.cs

@@ -20,6 +20,7 @@
 using Microsoft.Azure.Commands.ResourceManager.Common;
 using Microsoft.WindowsAzure.Commands.Common;
 using Microsoft.Azure.Commands.Profile.Properties;
+using System;
 
 namespace Microsoft.Azure.Commands.Profile
 {
@@ -78,6 +79,18 @@ public override void ExecuteCmdlet()
                     profileClient.SetCurrentContext(TenantId);
                 }
             }
+
+            if (AzureRmProfileProvider.Instance.Profile.Context != null &&
+                AzureRmProfileProvider.Instance.Profile.Context.Subscription != null &&
+                AzureRmProfileProvider.Instance.Profile.Context.Subscription.State != null &&
+                !AzureRmProfileProvider.Instance.Profile.Context.Subscription.State.Equals(
+                "Enabled", 
+                StringComparison.OrdinalIgnoreCase))
+            {
+                WriteWarning(string.Format(
+                               Microsoft.Azure.Commands.Profile.Properties.Resources.SelectedSubscriptionNotActive,
+                               AzureRmProfileProvider.Instance.Profile.Context.Subscription.State));
+            }
             WriteObject((PSAzureContext)AzureRmProfileProvider.Instance.Profile.Context);
         }
     }

src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.format.ps1xml

@@ -85,6 +85,9 @@
               <ListItem>
                 <PropertyName>TenantId</PropertyName>
               </ListItem>
+              <ListItem>
+                <PropertyName>State</PropertyName>
+              </ListItem>
             </ListItems>
           </ListEntry>
         </ListEntries>

src/ResourceManager/Profile/Commands.Profile/Models/ModelExtensions.cs

@@ -31,6 +31,7 @@ internal static AzureSubscription ToAzureSubscription(this Subscription other, A
             subscription.Environment = context.Environment != null ? context.Environment.Name : EnvironmentName.AzureCloud;
             subscription.Id = new Guid(other.SubscriptionId);
             subscription.Name = other.DisplayName;
+            subscription.State = other.State;
             subscription.SetProperty(AzureSubscription.Property.Tenants,
                 context.Tenant.Id.ToString());
             return subscription;

src/ResourceManager/Profile/Commands.Profile/Models/PSAzureSubscription.cs

@@ -39,7 +39,8 @@ public static implicit operator PSAzureSubscription(AzureSubscription other)
             var subscription= new PSAzureSubscription
             {
                 SubscriptionId = other.Id.ToString(),
-                SubscriptionName = other.Name ,
+                SubscriptionName = other.Name,
+                State = other.State,
                 TenantId = other.IsPropertySet(AzureSubscription.Property.Tenants)? 
                 other.GetProperty(AzureSubscription.Property.Tenants) : null
             };
@@ -89,6 +90,11 @@ public static implicit operator AzureSubscription(PSAzureSubscription other)
                 result.Properties.SetProperty(AzureSubscription.Property.StorageAccount, other.CurrentStorageAccount);
             }
 
+            if (other.State != null)
+            {
+                result.State = other.State;
+            }
+
             return result;
         }
 
@@ -102,6 +108,11 @@ public static implicit operator AzureSubscription(PSAzureSubscription other)
         /// </summary>
         public string SubscriptionName { get; set; }
 
+        /// <summary>
+        /// Gets or sets subscription State
+        /// </summary>
+        public string State { get; set; }
+
         /// <summary>
         /// The tenant home for the subscription.
         /// </summary>

src/ResourceManager/Profile/Commands.Profile/Models/RMProfileClient.cs

@@ -143,6 +143,12 @@ public AzureRMProfile Login(
             else
             {
                 _profile.Context = new AzureContext(newSubscription, account, environment, newTenant);
+                if (!newSubscription.State.Equals("Enabled", StringComparison.OrdinalIgnoreCase))
+                {
+                    WriteWarningMessage(string.Format(
+                                   Microsoft.Azure.Commands.Profile.Properties.Resources.SelectedSubscriptionNotActive,
+                                   newSubscription.State));
+                }
             }
 
             _profile.Context.TokenCache = TokenCache.DefaultShared.Serialize();
@@ -222,7 +228,11 @@ private void SwitchSubscription(AzureSubscription subscription)
                 _profile.Context.Subscription.Properties[AzureSubscription.Property.Tenants] = tenantId;
             }
 
-            var newSubscription = new AzureSubscription { Id = subscription.Id };
+            var newSubscription = new AzureSubscription 
+            { 
+                Id = subscription.Id,
+                State = subscription.State
+            };
             if (_profile.Context.Subscription != null)
             {
                 newSubscription.Account = _profile.Context.Subscription.Account;
@@ -523,6 +533,7 @@ private bool TryGetTenantSubscription(IAccessToken accessToken,
                         Account = accessToken.UserId,
                         Environment = environment.Name,
                         Name = subscriptionFromServer.DisplayName,
+                        State = subscriptionFromServer.State,
                         Properties = new Dictionary<AzureSubscription.Property, string> { { AzureSubscription.Property.Tenants, accessToken.TenantId } }
                     };
 

src/ResourceManager/Profile/Commands.Profile/Profile/SelectAzureRMProfile.cs

@@ -58,6 +58,18 @@ public override void ExecuteCmdlet()
                 throw new ArgumentException(Resources.AzureProfileMustNotBeNull);
             }
 
+            if (AzureRmProfileProvider.Instance.Profile.Context != null &&
+                AzureRmProfileProvider.Instance.Profile.Context.Subscription != null &&
+                AzureRmProfileProvider.Instance.Profile.Context.Subscription.State != null &&
+                !AzureRmProfileProvider.Instance.Profile.Context.Subscription.State.Equals(
+                "Enabled",
+                StringComparison.OrdinalIgnoreCase))
+            {
+                WriteWarning(string.Format(
+                               Microsoft.Azure.Commands.Profile.Properties.Resources.SelectedSubscriptionNotActive,
+                               AzureRmProfileProvider.Instance.Profile.Context.Subscription.State));
+            }
+
             WriteObject((PSAzureProfile)AzureRmProfileProvider.Instance.Profile);
         }
     }

src/ResourceManager/Profile/Commands.Profile/Properties/Resources.Designer.cs

@@ -147,6 +147,9 @@
   <data name="NoValidTenant" xml:space="preserve">
     <value>Please provide a valid tenant Id on the command line or execute Login-AzureRmAccount.</value>
   </data>
+  <data name="SelectedSubscriptionNotActive" xml:space="preserve">
+    <value>Selected subscription is in '{0}' state. </value>
+  </data>
   <data name="SetAzureRmContextNoParameterSet" xml:space="preserve">
     <value>Please provide either a subscription ID, subscription name, tenant Id or domain.</value>
   </data>