Migrate Azure to ARM

ipa/ipa_constants.py

@@ -28,7 +28,7 @@
 SUPPORTED_DISTROS = ('openSUSE_Leap', 'SLES')
 SUPPORTED_PROVIDERS = ('azure', 'ec2', 'gce')
 
-AZURE_DEFAULT_TYPE = 'Small'
+AZURE_DEFAULT_TYPE = 'Standard_B1ms'
 AZURE_DEFAULT_USER = 'azureuser'
 EC2_DEFAULT_TYPE = 't2.micro'
 EC2_DEFAULT_USER = 'ec2-user'

ipa/ipa_controller.py

@@ -55,10 +55,11 @@ def test_image(provider_name,
                ssh_key_name=None,
                ssh_private_key=None,
                ssh_user=None,
-               storage_container=None,
                subnet_id=None,
                test_dirs=None,
-               tests=None):
+               tests=None,
+               vnet_name=None,
+               vnet_resource_group=None):
     """Creates a cloud provider instance and initiates testing."""
     if provider_name == 'azure':
         provider_class = AzureProvider
@@ -93,10 +94,11 @@ def test_image(provider_name,
         ssh_key_name=ssh_key_name,
         ssh_private_key=ssh_private_key,
         ssh_user=ssh_user,
-        storage_container=storage_container,
         subnet_id=subnet_id,
         test_dirs=test_dirs,
-        test_files=tests
+        test_files=tests,
+        vnet_name=vnet_name,
+        vnet_resource_group=vnet_resource_group
     )
 
     return provider.test_image()

ipa/ipa_ec2.py

@@ -59,10 +59,12 @@ def __init__(self,
                  ssh_key_name=None,
                  ssh_private_key=None,
                  ssh_user=None,
-                 storage_container=None,  # Not used in EC2
                  subnet_id=None,
                  test_dirs=None,
-                 test_files=None):
+                 test_files=None,
+                 vnet_name=None,  # Not used in EC2
+                 vnet_resource_group=None  # Not used in EC2
+                 ):
         """Initialize EC2 provider class."""
         super(EC2Provider, self).__init__('ec2',
                                           cleanup,

ipa/ipa_gce.py

@@ -61,10 +61,12 @@ def __init__(self,
                  ssh_key_name=None,  # Not used in GCE
                  ssh_private_key=None,
                  ssh_user=None,
-                 storage_container=None,  # Not used in GCE
                  subnet_id=None,
                  test_dirs=None,
-                 test_files=None):
+                 test_files=None,
+                 vnet_name=None,  # Not used in GCE
+                 vnet_resource_group=None  # Not used in GCE
+                 ):
         super(GCEProvider, self).__init__('gce',
                                           cleanup,
                                           config,

ipa/scripts/cli.py

@@ -192,11 +192,6 @@ def main():
     '--ssh-user',
     help='SSH user for accessing instance.'
 )
-@click.option(
-    '-S',
-    '--storage-container',
-    help='Azure storage container to use.'
-)
 @click.option(
     '--subnet-id',
     help='Subnet to launch the new instance into.'
@@ -205,6 +200,14 @@ def main():
     '--test-dirs',
     help='Directories to search for tests.'
 )
+@click.option(
+    '--vnet-name',
+    help='Azure virtual network name to attach network interface.'
+)
+@click.option(
+    '--vnet-resource-group',
+    help='Azure resource group name where virtual network is found.'
+)
 @click.argument(
     'provider',
     type=click.Choice(SUPPORTED_PROVIDERS)
@@ -232,9 +235,10 @@ def test(access_key_id,
          ssh_key_name,
          ssh_private_key,
          ssh_user,
-         storage_container,
          subnet_id,
          test_dirs,
+         vnet_name,
+         vnet_resource_group,
          provider,
          tests):
     """Test image in the given framework using the supplied test files."""
@@ -262,10 +266,11 @@ def test(access_key_id,
             ssh_key_name,
             ssh_private_key,
             ssh_user,
-            storage_container,
             subnet_id,
             test_dirs,
-            tests
+            tests,
+            vnet_name,
+            vnet_resource_group
         )
         echo_results(results, no_color)
         sys.exit(status)
@@ -387,7 +392,7 @@ def results(clear,
                 echo_log(log_file, no_color)
             else:
                 echo_results_file(
-                    log_file.split('.')[0] + '.results',
+                    log_file.rsplit('.', 1)[0] + '.results',
                     no_color,
                     verbose
                 )

package/python3-ipa.spec

@@ -28,7 +28,10 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 %if %{with test}
 BuildRequires:  python3-apache-libcloud
-BuildRequires:  python3-azurectl >= 3.0.1
+BuildRequires:  python3-azure-common
+BuildRequires:  python3-azure-mgmt-compute
+BuildRequires:  python3-azure-mgmt-network
+BuildRequires:  python3-azure-mgmt-resource
 BuildRequires:  python3-click
 BuildRequires:  python3-coverage
 BuildRequires:  python3-cryptography
@@ -40,7 +43,10 @@ BuildRequires:  python3-PyYAML
 BuildRequires:  python3-testinfra
 %endif
 Requires:       python3-apache-libcloud
-Requires:       python3-azurectl >= 3.0.1
+Requires:       python3-azure-common
+Requires:       python3-azure-mgmt-compute
+Requires:       python3-azure-mgmt-network
+Requires:       python3-azure-mgmt-resource
 Requires:       python3-click
 Requires:       python3-cryptography
 Requires:       python3-paramiko

setup.py

@@ -28,7 +28,10 @@
 
 requirements = [
     'apache-libcloud',
-    'azurectl>=3.0.1',
+    'azure-common',
+    'azure-mgmt-compute',
+    'azure-mgmt-network',
+    'azure-mgmt-resource',
     'Click',
     'cryptography',
     'paramiko',
@@ -87,7 +90,8 @@
         'Environment :: Console',
         'Intended Audience :: Developers',
         'Topic :: Software Development :: Testing',
-        'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+        'License :: OSI Approved :: '
+        'GNU General Public License v3 or later (GPLv3+)',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',

tests/azure/test-sa.json

@@ -0,0 +1,12 @@
+{
+  "clientId": "12345",
+  "clientSecret": "12345",
+  "subscriptionId": "12345",
+  "tenantId": "12345",
+  "activeDirectoryEndpointUrl": "https://login.microsoftonline.com",
+  "resourceManagerEndpointUrl": "https://management.azure.com/",
+  "activeDirectoryGraphResourceId": "https://graph.windows.net/",
+  "sqlManagementEndpointUrl": "https://management.core.windows.net:8443/",
+  "galleryEndpointUrl": "https://gallery.azure.com/",
+  "managementEndpointUrl": "https://management.core.windows.net/"
+}