
from tempest import clients

from monasca_log_api_tempest.services import log_api_v2_client
from monasca_log_api_tempest.services import log_api_v3_client
from monasca_log_api_tempest.services import log_search_client


class Manager(clients.Manager):
    def __init__(self, credentials=None, service=None):
        super(Manager, self).__init__(credentials, service)

        self.log_api_clients = {
            "v2": log_api_v2_client.LogApiV2Client(
                self.auth_provider,
                'logs_v2',
                None
            ),
            "v3": log_api_v3_client.LogApiV3Client(
                self.auth_provider,
                'logs',
                None
            )
        }
        self.log_search_client = log_search_client.LogsSearchClient(
            self.auth_provider,
            'logs-search',
            None
        )


from tempest import clients

from monasca_log_api_tempest.services import log_api_v2_client
from monasca_log_api_tempest.services import log_api_v3_client
from monasca_log_api_tempest.services import log_search_client


class Manager(clients.Manager):
    def __init__(self, credentials=None):
        super(Manager, self).__init__(credentials)

        self.log_api_clients = {
            "v2": log_api_v2_client.LogApiV2Client(
                self.auth_provider,
                'logs_v2',
                None
            ),
            "v3": log_api_v3_client.LogApiV3Client(
                self.auth_provider,
                'logs',
                None
            )
        }
        self.log_search_client = log_search_client.LogsSearchClient(
            self.auth_provider,
            'logs-search',
            None
        )

Fix the Monasca Log API tempest tests
Fix the Monasca Log API tempest tests

The Tempest Manager class must have changed and the service
argument apparently no longer exists. Instead, it was being set
as the scope which caused the catalog to not be retrieved

See-also: If934bac4e2cd833fe4e381c373218383354969ec
Change-Id: I43c023e91eb93e2c19096b0de812eabf7b2db62c

  
  from tempest import clients
  
  from monasca_log_api_tempest.services import log_api_v2_client
  from monasca_log_api_tempest.services import log_api_v3_client
  from monasca_log_api_tempest.services import log_search_client
  
  
  class Manager(clients.Manager):
-     def __init__(self, credentials=None, service=None):
+     def __init__(self, credentials=None):
-         super(Manager, self).__init__(credentials, service)
+         super(Manager, self).__init__(credentials)
  
          self.log_api_clients = {
              "v2": log_api_v2_client.LogApiV2Client(
                  self.auth_provider,
                  'logs_v2',
                  None
              ),
              "v3": log_api_v3_client.LogApiV3Client(
                  self.auth_provider,
                  'logs',
                  None
              )
          }
          self.log_search_client = log_search_client.LogsSearchClient(
              self.auth_provider,
              'logs-search',
              None
          )
  
Fix the Monasca Log API tempest tests
## Code Before:

from tempest import clients

from monasca_log_api_tempest.services import log_api_v2_client
from monasca_log_api_tempest.services import log_api_v3_client
from monasca_log_api_tempest.services import log_search_client


class Manager(clients.Manager):
    def __init__(self, credentials=None, service=None):
        super(Manager, self).__init__(credentials, service)

        self.log_api_clients = {
            "v2": log_api_v2_client.LogApiV2Client(
                self.auth_provider,
                'logs_v2',
                None
            ),
            "v3": log_api_v3_client.LogApiV3Client(
                self.auth_provider,
                'logs',
                None
            )
        }
        self.log_search_client = log_search_client.LogsSearchClient(
            self.auth_provider,
            'logs-search',
            None
        )

## Instruction:
Fix the Monasca Log API tempest tests
## Code After:

from tempest import clients

from monasca_log_api_tempest.services import log_api_v2_client
from monasca_log_api_tempest.services import log_api_v3_client
from monasca_log_api_tempest.services import log_search_client


class Manager(clients.Manager):
    def __init__(self, credentials=None):
        super(Manager, self).__init__(credentials)

        self.log_api_clients = {
            "v2": log_api_v2_client.LogApiV2Client(
                self.auth_provider,
                'logs_v2',
                None
            ),
            "v3": log_api_v3_client.LogApiV3Client(
                self.auth_provider,
                'logs',
                None
            )
        }
        self.log_search_client = log_search_client.LogsSearchClient(
            self.auth_provider,
            'logs-search',
            None
        )
