Eureka Version Tag

2 files changed, 12 insertions, 6 deletions

diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs
index e610efc2d..a3c074df9 100644
--- a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs
+++ b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs
@@ -333,8 +333,8 @@ namespace Tango.AzureUtils.Environment
             {
                 try
                 {
-                    await _storageManager.ValidateEurekaStorageUpgrade(sourceApp, targetApp, config.PPCVersionTag);
-                    await _storageManager.UpgradeEurekaStorage(sourceApp, targetApp, config.PPCVersionTag);
+                    await _storageManager.ValidateEurekaStorageUpgrade(sourceApp, targetApp, config.EurekaVersionTag);
+                    await _storageManager.UpgradeEurekaStorage(sourceApp, targetApp, config.EurekaVersionTag);
                 }
                 catch (Exception ex)
                 {
@@ -403,8 +403,8 @@ namespace Tango.AzureUtils.Environment
             {
                 try
                 {
-                    await _databaseManager.ValidateEurekaDatabaseUpgrade(sourceApp, targetApp, config.PPCVersionTag);
-                    await _databaseManager.UpgradeEurekaVersion(sourceApp, targetApp, config.PPCVersionTag);
+                    await _databaseManager.ValidateEurekaDatabaseUpgrade(sourceApp, targetApp, config.EurekaVersionTag);
+                    await _databaseManager.UpgradeEurekaVersion(sourceApp, targetApp, config.EurekaVersionTag);
                 }
                 catch (Exception ex)
                 {
@@ -476,7 +476,7 @@ namespace Tango.AzureUtils.Environment
             //Add Eureka storage versions.
             if (config.CopyEurekaStorageBlobs)
             {
-                await _storageManager.ValidateEurekaStorageUpgrade(sourceApp, targetApp, config.PPCVersionTag);
+                await _storageManager.ValidateEurekaStorageUpgrade(sourceApp, targetApp, config.EurekaVersionTag);
             }
 
             //Add FSE storage versions.
@@ -506,7 +506,7 @@ namespace Tango.AzureUtils.Environment
             //Upgrade Eureka database version.
             if (config.UpgradeEurekaDatabaseVersion)
             {
-                await _databaseManager.ValidateEurekaDatabaseUpgrade(sourceApp, targetApp, config.PPCVersionTag);
+                await _databaseManager.ValidateEurekaDatabaseUpgrade(sourceApp, targetApp, config.EurekaVersionTag);
             }
 
             //Upgrade FSE database version.
diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/UpgradeEnvironmentConfiguration.cs b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/UpgradeEnvironmentConfiguration.cs
index 0dbaec3c0..c6769ef3f 100644
--- a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/UpgradeEnvironmentConfiguration.cs
+++ b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/UpgradeEnvironmentConfiguration.cs
@@ -29,5 +29,11 @@ namespace Tango.AzureUtils.Environment
             set { _ppcVersionTag = value; RaisePropertyChangedAuto(); }
         }
 
+        private String _eurekaVersionTag;
+        public String EurekaVersionTag
+        {
+            get { return _eurekaVersionTag.IsNotNullOrEmpty() ? _eurekaVersionTag : null; }
+            set { _eurekaVersionTag = value; RaisePropertyChangedAuto(); }
+        }
     }
 }