Fixed tests and error logic

AzureArcForKubernetes · Jul 21, 2021 · 21cc218 · 21cc218
1 parent 6e7b9a9
commit 21cc218
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py
@@ -232,7 +232,7 @@ def __validate_scoring_fe_settings(self, configuration_settings, configuration_p
         if feIsNodePort and feIsInternalLoadBalancer:
             raise MutuallyExclusiveArgumentError(
                 "Specify either privateEndpointNodeport=true or privateEndpointILB=true, but not both.")
-        elif feIsNodePort:
+        if feIsNodePort:
             configuration_settings['scoringFe.serviceType.nodePort'] = feIsNodePort
         elif feIsInternalLoadBalancer:
             configuration_settings['scoringFe.serviceType.internalLoadBalancer'] = feIsInternalLoadBalancer

diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/OpenServiceMesh.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/OpenServiceMesh.py
@@ -12,8 +12,6 @@
 from azure.cli.core.azclierror import InvalidArgumentValueError, RequiredArgumentMissingError
 from azure.cli.core.commands.client_factory import get_subscription_id
 
-from pyhelm.chartbuilder import ChartBuilder
-from pyhelm.repo import VersionError
 from packaging import version
 import yaml
 import requests
@@ -102,6 +100,7 @@ def Update(self, extension, auto_upgrade_minor_version, release_train, version):
             version=version
         )
 
+
 def _validate_tested_distro(cmd, cluster_resource_group_name, cluster_name, extension_version):
 
     field_unavailable_error = '\"testedDistros\" field unavailable for version {0} of microsoft.openservicemesh, ' \
@@ -133,6 +132,7 @@ def _validate_tested_distro(cmd, cluster_resource_group_name, cluster_name, exte
         logger.warning('Untested kubernetes distro for microsoft.openservicemesh, Kubernetes distro is %s',
                        cluster_distro)
 
+
 def _get_tested_distros(chart_version):
 
     chart_url = 'https://raw.githubusercontent.com/Azure/osm-azure/' \

diff --git a/src/k8s-extension/azext_k8s_extension/tests/latest/test_k8s_extension_scenario.py b/src/k8s-extension/azext_k8s_extension/tests/latest/test_k8s_extension_scenario.py
@@ -6,7 +6,7 @@
 # pylint: disable=line-too-long
 
 import os
-from azure.cli.testsdk import (ScenarioTest, ResourceGroupPreparer, record_only)
+from azure.cli.testsdk import (ScenarioTest, record_only)
 
 
 TEST_DIR = os.path.abspath(os.path.join(os.path.abspath(__file__), '..'))