simplify business ID option

Author: adorton-adobe

tests/test_config.py

@@ -257,8 +257,7 @@ def test_uses_business_id_true(tmp_config_files, modify_umapi_config, cli_args,
     connector_options, _ = config_loader.get_umapi_options()
     UmapiConnector.create_conn = False
     umapi_connector = UmapiConnector('.primary', connector_options)
-    assert umapi_connector.ignore_identity_type
-    assert umapi_connector.remove_trustee_users
+    assert umapi_connector.uses_business_id
 
 
 def test_uses_business_id_false(tmp_config_files, modify_umapi_config, cli_args, private_key):
@@ -270,8 +269,7 @@ def test_uses_business_id_false(tmp_config_files, modify_umapi_config, cli_args,
     connector_options, _ = config_loader.get_umapi_options()
     UmapiConnector.create_conn = False
     umapi_connector = UmapiConnector('.primary', connector_options)
-    assert not umapi_connector.ignore_identity_type
-    assert not umapi_connector.remove_trustee_users
+    assert not umapi_connector.uses_business_id
 
 
 def test_uses_business_id_unspecified(tmp_config_files, modify_umapi_config, cli_args, private_key):
@@ -282,5 +280,4 @@ def test_uses_business_id_unspecified(tmp_config_files, modify_umapi_config, cli
     connector_options, _ = config_loader.get_umapi_options()
     UmapiConnector.create_conn = False
     umapi_connector = UmapiConnector('.primary', connector_options)
-    assert not umapi_connector.ignore_identity_type
-    assert not umapi_connector.remove_trustee_users
+    assert not umapi_connector.uses_business_id

user_sync/connector/umapi.py

@@ -56,12 +56,7 @@ def __init__(self, name, caller_options):
         self.trusted = caller_config.get_bool('trusted', True)
         if self.trusted is None:
             self.trusted = False
-        uses_business_id = caller_config.get_bool('uses_business_id', True)
-        self.ignore_identity_type = False
-        self.remove_trustee_users = False
-        if uses_business_id is True:
-                self.ignore_identity_type = True
-                self.remove_trustee_users = True
+        self.uses_business_id = caller_config.get_bool('uses_business_id', True)
         builder = user_sync.config.OptionsBuilder(caller_config)
         builder.set_string_value('logger_name', self.name)
         builder.set_bool_value('test_mode', False)