Instance status field rectified

cloudbridge/cloud/providers/azure/mock_azure_client.py

@@ -5,9 +5,10 @@ from io import BytesIO
 
 from azure.common import AzureException
 from azure.mgmt.compute.models import CreationData, DataDisk, \
-    Disk, DiskCreateOption, Image, ManagedDiskParameters, \
+    Disk, DiskCreateOption, Image, InstanceViewStatus, \
+    ManagedDiskParameters, \
     NetworkProfile, OSDisk, Snapshot, StorageProfile, VirtualMachine, \
-    VirtualMachineSize
+    VirtualMachineInstanceView, VirtualMachineSize
 
 from azure.mgmt.network.models import AddressSpace, NetworkInterface, \
     NetworkSecurityGroup, PublicIPAddress
@@ -238,6 +239,11 @@ class MockAzureClient:
     vm1.provisioning_state = 'Succeeded'
     vm1.storage_profile = StorageProfile()
     vm1.tags = {'Name': 'VM1'}
+    vm1.instance_view = VirtualMachineInstanceView()
+    vm1.instance_view.statuses = [
+        InstanceViewStatus(display_status='VM running'),
+        InstanceViewStatus(display_status='VM running'),
+    ]
     data_disk_id = '/subscriptions'\
                    '/7904d702-e01c-4826-8519-f5a25c866a96' \
                    '/resourceGroups/CLOUDBRIDGE-AZURE' \
@@ -258,6 +264,11 @@ class MockAzureClient:
     vm2 = VirtualMachine(location='eastus')
     vm2.name = 'VM2'
     vm2.tags = {'Name': 'VM2'}
+    vm2.instance_view = VirtualMachineInstanceView()
+    vm2.instance_view.statuses = [
+        InstanceViewStatus(display_status='VM running'),
+        InstanceViewStatus(display_status='VM running'),
+    ]
     vm2.id = '/subscriptions/7904d702-e01c-4826-8519-f5a25c866a96' \
              '/resourceGroups/CLOUDBRIDGE-AZURE' \
              '/providers/Microsoft.Compute/virtualMachines/VM2'
@@ -744,6 +755,12 @@ class MockAzureClient:
         vm.network_profile = NetworkProfile()
         vm.network_profile.network_interfaces = [nic]
 
+        vm.instance_view = VirtualMachineInstanceView()
+        vm.instance_view.statuses = [
+            InstanceViewStatus(display_status='VM running'),
+            InstanceViewStatus(display_status='VM running'),
+        ]
+
         self.virtual_machines.append(vm)
         return vm
 

cloudbridge/cloud/providers/azure/resources.py

@@ -1107,6 +1107,8 @@ class AzureSubnet(BaseSubnet):
 
 
 class AzureInstance(BaseInstance):
+    # ref:
+    # http://docs.azure.amazon.com/AzureEC2/latest/UserGuide/ec2-instance-lifecycle.html
     INSTANCE_STATE_MAP = {
         'InProgress': InstanceState.PENDING,
         'Creating': InstanceState.PENDING,
@@ -1265,7 +1267,7 @@ class AzureInstance(BaseInstance):
     @property
     def image_id(self):
         """
-        Get the image ID for this instance.
+        Get the image ID for this insance.
         """
         return self._vm.storage_profile.image_reference.id
 
@@ -1281,6 +1283,9 @@ class AzureInstance(BaseInstance):
         """
         Get the security groups associated with this instance.
         """
+        # boto instance.groups field returns a ``Group`` object so need to
+        # convert that into a ``SecurityGroup`` object before creating a
+        # cloudbridge SecurityGroup object
         return [self._provider.security.security_groups.get(group_id)
                 for group_id in self._security_group_ids]
 
@@ -1342,7 +1347,7 @@ class AzureInstance(BaseInstance):
     def add_floating_ip(self, ip_address):
         try:
             ip_addresses = [ip for ip in self._provider.
-                            azure_client.list_floating_ips()
+                azure_client.list_public_ips()
                             if ip.ip_address and ip.ip_address == ip_address]
             if len(ip_addresses) > 0:
                 """
@@ -1415,18 +1420,6 @@ class AzureInstance(BaseInstance):
             create_nic(nic_name, nic)
 
     def remove_security_group(self, sg):
-
-        '''
-            :param sg:
-            :return: None
-
-            This method removes the security group from VM.
-            In Azure, security group added to Network interface.
-            Azure supports to add only one security group to
-            network interface, we are removing the provided security group
-            if it associated with NIC else ignoring.
-        '''
-
         nic_id = \
             self._vm.network_profile.network_interfaces[0].id
         nic_params = azure_helpers. \
@@ -1441,8 +1434,10 @@ class AzureInstance(BaseInstance):
                 create_nic(nic_name, nic)
 
     def update_state(self):
-        if self._vm.instance_view and\
-                        len(self._vm.instance_view.statuses) > 1:
+        if not self._vm.instance_view:
+            self.refresh()
+        if self._vm.instance_view and len(
+                self._vm.instance_view.statuses) > 1:
             self._state = \
                 self._vm.instance_view.statuses[1].display_status
         else: