Merge pull request #8 from PauloRamosGit/master

v1.3.1.1
Azure · Jul 10, 2016 · d0c5ce2 · d0c5ce2
2 parents fd65e6c + 8ff4930
commit d0c5ce2
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/migaz/readme.md b/migaz/readme.md
@@ -57,9 +57,9 @@ The tool uses Service Management REST API calls to gather all the details on Net
 
 - **Copyblobdetails.JSON** - This file contains the Source and Target Storage Accounts with their keys to access them for the blob copy
 
-- **MEGAZ-&lt;YYYYMMDD&gt;.log** - This file is created in the %USERPROFILE%\appdata\Local and record each steps processed in the tool
+- **MIGAZ-&lt;YYYYMMDD&gt;.log** - This file is created in the %USERPROFILE%\appdata\Local and record each steps processed in the tool
 
-- **MEGAZ-XML-&lt;YYYYMMDD&gt;.log** - This file is created in the %USERPROFILE%\appdata\Local and it is an export of the raw xml captured and processed from the REST API calls
+- **MIGAZ-XML-&lt;YYYYMMDD&gt;.log** - This file is created in the %USERPROFILE%\appdata\Local and it is an export of the raw xml captured and processed from the REST API calls
 
 <br>
 > Migrating resources with these tool will cause downtime for your classic Virtual Machines. If you're looking for platform supported migration, please visit 

diff --git a/migaz/release/migAz v1.3.1.0.zip → migaz/release/migAz v1.3.1.1.zip b/migaz/release/migAz v1.3.1.0.zip → migaz/release/migAz v1.3.1.1.zip
diff --git a/migaz/source/MIGAZ/Forms/Window.cs b/migaz/source/MIGAZ/Forms/Window.cs
@@ -259,26 +259,29 @@ private void cmbSubscriptions_SelectedIndexChanged(object sender, EventArgs e)
                     XmlNodeList hostedservice = GetAzureASMResources("CloudService", cloudserviceinfo);
                     if (hostedservice[0].SelectNodes("Deployments/Deployment").Count > 0)
                     {
-                        if (hostedservice[0].SelectNodes("Deployments/Deployment")[0].SelectNodes("RoleList/Role")[0].SelectSingleNode("RoleType").InnerText == "PersistentVMRole")
+                        if (hostedservice[0].SelectNodes("Deployments/Deployment")[0].SelectNodes("RoleList/Role")[0].SelectNodes("RoleType").Count > 0)
                         {
-                            string virtualnetworkname = "empty";
-                            if (hostedservice[0].SelectNodes("Deployments/Deployment")[0].SelectSingleNode("VirtualNetworkName") != null)
+                            if (hostedservice[0].SelectNodes("Deployments/Deployment")[0].SelectNodes("RoleList/Role")[0].SelectSingleNode("RoleType").InnerText == "PersistentVMRole")
                             {
-                                virtualnetworkname = hostedservice[0].SelectNodes("Deployments/Deployment")[0].SelectSingleNode("VirtualNetworkName").InnerText;
-                            }
-                            string deploymentname = hostedservice[0].SelectNodes("Deployments/Deployment")[0].SelectSingleNode("Name").InnerText;
-                            XmlNodeList roles = hostedservice[0].SelectNodes("Deployments/Deployment")[0].SelectNodes("RoleList/Role");
-                            // GetVMLBMapping is necessary because a Cloud Service can have multiple availability sets
-                            // On ARM, a load balancer can only be attached to 1 availability set
-                            // Because of this, if multiple availability sets exist, we are breaking the cloud service in multiple load balancers
-                            //     to respect all availability sets
-                            Dictionary<string, string> vmlbmapping = GetVMLBMapping(cloudservicename, roles);
-                            foreach (XmlNode role in roles) 
-                            {
-                                string virtualmachinename = role.SelectSingleNode("RoleName").InnerText;
-                                string loadbalancername = vmlbmapping[virtualmachinename];
-                                gridVirtualMachines.Rows.Add(cloudservicename, role.SelectSingleNode("RoleName").InnerText, deploymentname, virtualnetworkname, loadbalancername);
-                                Application.DoEvents();
+                                string virtualnetworkname = "empty";
+                                if (hostedservice[0].SelectNodes("Deployments/Deployment")[0].SelectSingleNode("VirtualNetworkName") != null)
+                                {
+                                    virtualnetworkname = hostedservice[0].SelectNodes("Deployments/Deployment")[0].SelectSingleNode("VirtualNetworkName").InnerText;
+                                }
+                                string deploymentname = hostedservice[0].SelectNodes("Deployments/Deployment")[0].SelectSingleNode("Name").InnerText;
+                                XmlNodeList roles = hostedservice[0].SelectNodes("Deployments/Deployment")[0].SelectNodes("RoleList/Role");
+                                // GetVMLBMapping is necessary because a Cloud Service can have multiple availability sets
+                                // On ARM, a load balancer can only be attached to 1 availability set
+                                // Because of this, if multiple availability sets exist, we are breaking the cloud service in multiple load balancers
+                                //     to respect all availability sets
+                                Dictionary<string, string> vmlbmapping = GetVMLBMapping(cloudservicename, roles);
+                                foreach (XmlNode role in roles)
+                                {
+                                    string virtualmachinename = role.SelectSingleNode("RoleName").InnerText;
+                                    string loadbalancername = vmlbmapping[virtualmachinename];
+                                    gridVirtualMachines.Rows.Add(cloudservicename, role.SelectSingleNode("RoleName").InnerText, deploymentname, virtualnetworkname, loadbalancername);
+                                    Application.DoEvents();
+                                }
                             }
                         }
                     }

diff --git a/migaz/source/MIGAZ/Properties/AssemblyInfo.cs b/migaz/source/MIGAZ/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.1.0")]
-[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyVersion("1.3.1.1")]
+[assembly: AssemblyFileVersion("1.3.1.1")]