Use oslo.log for heat_integrationtests
Later the integration jobs can be tuned to have their own logging settings. This change also raises _log_console_output to info, so it is displayed by default. Change-Id: Ifcaa6faf76c655e0c8cfd7d76775b80de70062c4
This commit is contained in:
parent
a754a083a3
commit
c21bca268a
@ -20,10 +20,6 @@ import neutronclient.v2_0.client
|
|||||||
import novaclient.client
|
import novaclient.client
|
||||||
import swiftclient
|
import swiftclient
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class ClientManager(object):
|
class ClientManager(object):
|
||||||
"""
|
"""
|
||||||
|
@ -11,12 +11,12 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import cStringIO
|
import cStringIO
|
||||||
import logging
|
|
||||||
import re
|
import re
|
||||||
import select
|
import select
|
||||||
import socket
|
import socket
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
from oslo_log import log as logging
|
||||||
import paramiko
|
import paramiko
|
||||||
import six
|
import six
|
||||||
|
|
||||||
|
@ -10,7 +10,6 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import logging
|
|
||||||
import os
|
import os
|
||||||
import random
|
import random
|
||||||
import re
|
import re
|
||||||
@ -19,6 +18,7 @@ import time
|
|||||||
|
|
||||||
import fixtures
|
import fixtures
|
||||||
from heatclient import exc as heat_exceptions
|
from heatclient import exc as heat_exceptions
|
||||||
|
from oslo_log import log as logging
|
||||||
from oslo_utils import timeutils
|
from oslo_utils import timeutils
|
||||||
import six
|
import six
|
||||||
import testscenarios
|
import testscenarios
|
||||||
@ -111,8 +111,8 @@ class HeatIntegrationTest(testscenarios.WithScenarios,
|
|||||||
if not servers:
|
if not servers:
|
||||||
servers = self.compute_client.servers.list()
|
servers = self.compute_client.servers.list()
|
||||||
for server in servers:
|
for server in servers:
|
||||||
LOG.debug('Console output for %s', server.id)
|
LOG.info('Console output for %s', server.id)
|
||||||
LOG.debug(server.get_console_output())
|
LOG.info(server.get_console_output())
|
||||||
|
|
||||||
def _load_template(self, base_file, file_name, sub_dir=None):
|
def _load_template(self, base_file, file_name, sub_dir=None):
|
||||||
sub_dir = sub_dir or ''
|
sub_dir = sub_dir or ''
|
||||||
|
@ -12,8 +12,8 @@
|
|||||||
|
|
||||||
import copy
|
import copy
|
||||||
import json
|
import json
|
||||||
import logging
|
|
||||||
|
|
||||||
|
from oslo_log import log as logging
|
||||||
from testtools import matchers
|
from testtools import matchers
|
||||||
|
|
||||||
from heat_integrationtests.common import test
|
from heat_integrationtests.common import test
|
||||||
|
@ -12,10 +12,10 @@
|
|||||||
|
|
||||||
import hashlib
|
import hashlib
|
||||||
import json
|
import json
|
||||||
import logging
|
|
||||||
import random
|
import random
|
||||||
import urlparse
|
import urlparse
|
||||||
|
|
||||||
|
from oslo_log import log as logging
|
||||||
from swiftclient import utils as swiftclient_utils
|
from swiftclient import utils as swiftclient_utils
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
|
@ -12,16 +12,12 @@
|
|||||||
|
|
||||||
import copy
|
import copy
|
||||||
import json
|
import json
|
||||||
import logging
|
|
||||||
|
|
||||||
from testtools import matchers
|
from testtools import matchers
|
||||||
|
|
||||||
from heat_integrationtests.common import test
|
from heat_integrationtests.common import test
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class InstanceGroupTest(test.HeatIntegrationTest):
|
class InstanceGroupTest(test.HeatIntegrationTest):
|
||||||
|
|
||||||
template = '''
|
template = '''
|
||||||
|
@ -10,15 +10,12 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from heatclient import exc
|
from heatclient import exc
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from heat_integrationtests.common import test
|
from heat_integrationtests.common import test
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class RemoteStackTest(test.HeatIntegrationTest):
|
class RemoteStackTest(test.HeatIntegrationTest):
|
||||||
template = '''
|
template = '''
|
||||||
|
@ -11,16 +11,12 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import json
|
import json
|
||||||
import logging
|
|
||||||
|
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
from heat_integrationtests.common import test
|
from heat_integrationtests.common import test
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class TemplateResourceTest(test.HeatIntegrationTest):
|
class TemplateResourceTest(test.HeatIntegrationTest):
|
||||||
"""Prove that we can use the registry in a nested provider."""
|
"""Prove that we can use the registry in a nested provider."""
|
||||||
|
|
||||||
|
@ -10,14 +10,10 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from heat_integrationtests.common import test
|
from heat_integrationtests.common import test
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class UpdateStackTest(test.HeatIntegrationTest):
|
class UpdateStackTest(test.HeatIntegrationTest):
|
||||||
|
|
||||||
template = '''
|
template = '''
|
||||||
|
@ -10,14 +10,10 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from heat_integrationtests.common import test
|
from heat_integrationtests.common import test
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class StackValidationTest(test.HeatIntegrationTest):
|
class StackValidationTest(test.HeatIntegrationTest):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
|
@ -11,13 +11,10 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import json
|
import json
|
||||||
import logging
|
|
||||||
|
|
||||||
from heat_integrationtests.common import exceptions
|
from heat_integrationtests.common import exceptions
|
||||||
from heat_integrationtests.scenario import scenario_base
|
from heat_integrationtests.scenario import scenario_base
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class CfnInitIntegrationTest(scenario_base.ScenarioTestsBase):
|
class CfnInitIntegrationTest(scenario_base.ScenarioTestsBase):
|
||||||
"""
|
"""
|
||||||
|
@ -10,9 +10,9 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from cinderclient import exceptions as cinder_exceptions
|
from cinderclient import exceptions as cinder_exceptions
|
||||||
|
from oslo_log import log as logging
|
||||||
import six
|
import six
|
||||||
from testtools import testcase
|
from testtools import testcase
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user