Skip to content

Commit 1c3fa6a

Browse files
committed
flake
1 parent 773ae31 commit 1c3fa6a

File tree

6 files changed

+29
-31
lines changed

6 files changed

+29
-31
lines changed

cloudify_cli/async_commands/audit_log.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import asyncio
22
import json
33

4-
from cloudify_cli.exceptions import CloudifyCliError
54
from cloudify_cli.logger import get_global_json_output
65

76

cloudify_cli/commands/audit_log.py

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -91,26 +91,30 @@ def list_logs(
9191
else:
9292
import asyncio
9393
loop = asyncio.get_event_loop()
94-
loop.run_until_complete(_list_logs(creator_name,
95-
execution_id,
96-
since,
97-
sort_by,
98-
descending,
99-
pagination_offset,
100-
pagination_size,
101-
logger,
102-
client))
94+
loop.run_until_complete(_list_logs(
95+
creator_name,
96+
execution_id,
97+
since,
98+
sort_by,
99+
descending,
100+
pagination_offset,
101+
pagination_size,
102+
logger,
103+
client,
104+
))
103105

104106

105-
async def _list_logs(creator_name,
106-
execution_id,
107-
since,
108-
sort_by,
109-
descending,
110-
pagination_offset,
111-
pagination_size,
112-
logger,
113-
client):
107+
async def _list_logs(
108+
creator_name,
109+
execution_id,
110+
since,
111+
sort_by,
112+
descending,
113+
pagination_offset,
114+
pagination_size,
115+
logger,
116+
client,
117+
):
114118
"""List audit_log entries"""
115119
logger.info('Listing audit log entries...')
116120
logs = await client.auditlog.list(

cloudify_cli/env.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
import os
22
import json
33
import errno
4-
import types
54
import shutil
65
import getpass
76
import tempfile
8-
import itertools
97
from base64 import b64encode
108

119
import yaml
12-
import requests
1310

1411
from cloudify_rest_client.client import CloudifyClient, HTTPClient
1512
from cloudify.cluster_status import CloudifyNodeType
16-
from cloudify_rest_client.exceptions import CloudifyClientError
17-
from cloudify.utils import ipv6_url_compat
1813

1914
from cloudify_cli import constants
2015
from cloudify_cli.exceptions import CloudifyCliError
@@ -559,7 +554,6 @@ def get_auth_header(username, password):
559554
return header
560555

561556

562-
563557
# attributes that can differ for each node in a cluster. Those will be updated
564558
# in the profile when we switch to a new master.
565559
# Dicts with these keys live in profile.cluster, and are added there during

cloudify_cli/tests/commands/test_agents.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ def list_deployments(client_inst, **kwargs):
123123
CLOUDIFY_TENANT_HEADER)
124124
if not tenant_name:
125125
tenant_name = DEFAULT_TENANT_NAME
126-
all_node_instances = _topology_filter(client_inst, lambda x: True, **kwargs)
126+
all_node_instances = _topology_filter(
127+
client_inst, lambda x: True, **kwargs)
127128
deployments = {(x['tenant_name'], x['deployment_id'])
128129
for x in all_node_instances}
129130
deployments = [Deployment({'id': b, 'tenant_name': a}) for a, b in
@@ -137,7 +138,8 @@ def list_deployments(client_inst, **kwargs):
137138

138139
def list_nodes(client_inst, **kwargs):
139140
node_ids = kwargs.get('id')
140-
all_node_instances = _topology_filter(client_inst, lambda x: True, **kwargs)
141+
all_node_instances = _topology_filter(
142+
client_inst, lambda x: True, **kwargs)
141143
nodes = {(x['tenant_name'], x['deployment_id'], x['node_id'])
142144
for x in all_node_instances}
143145
nodes = [Node({'id': c, 'deployment_id': b, 'tenant_name': a}) for
@@ -409,8 +411,9 @@ def _wait_side_effect(*args, **kwargs):
409411
with patch('cloudify_cli.commands.agents.wait_for_execution',
410412
return_value=PropertyMock(error=False),
411413
side_effect=_wait_side_effect), \
412-
patch.object(ExecutionsClient, 'start', _mock_execution_start), \
413-
patch('cloudify_cli.commands.agents.time.sleep'):
414+
patch.object(
415+
ExecutionsClient, 'start', _mock_execution_start), \
416+
patch('cloudify_cli.commands.agents.time.sleep'):
414417

415418
get_deployments_and_run_workers(
416419
self.client, self._agent_filters(), True, self.logger,

cloudify_cli/tests/commands/test_base.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
from mock import patch, Mock, PropertyMock
2424

2525
from cloudify.utils import setup_logger
26-
from cloudify_rest_client import CloudifyClient
2726
from cloudify_rest_client.client import CLOUDIFY_TENANT_HEADER
2827
import click.testing as clicktest
2928

cloudify_cli/tests/commands/test_use.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ def mock_do_request(client_self, method, uri, **kwargs):
132132
self.verify = client_self.get_request_verify()
133133
return 'success'
134134

135-
136135
with patch('cloudify_rest_client.client.HTTPClient.do_request',
137136
new=mock_do_request):
138137
if self.client._client.port == SSL_PORT:

0 commit comments

Comments
 (0)