From 2eef6a1c218a7097653124a7e95834a7f2f88aff Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 6 Nov 2020 21:32:17 -0500 Subject: [PATCH] Lint: E265 block comment should start with '# ' --- api-daemon/pvcapid/flaskapi.py | 34 +++++++++++++++++----------------- daemon-common/common.py | 1 - daemon-common/network.py | 2 -- node-daemon/pvcnoded/Daemon.py | 1 - 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/api-daemon/pvcapid/flaskapi.py b/api-daemon/pvcapid/flaskapi.py index 2d2b7b5e..75e30fca 100755 --- a/api-daemon/pvcapid/flaskapi.py +++ b/api-daemon/pvcapid/flaskapi.py @@ -228,23 +228,23 @@ class API_Root(Resource): api.add_resource(API_Root, '/') # /doc - NOTE: Until flask_swagger is packaged for Debian this must be disabled -#class API_Doc(Resource): -# def get(self): -# """ -# Provide the Swagger API documentation -# --- -# tags: -# - root -# responses: -# 200: -# description: OK -# """ -# swagger_data = swagger(pvc_api.app) -# swagger_data['info']['version'] = API_VERSION -# swagger_data['info']['title'] = "PVC Client and Provisioner API" -# swagger_data['host'] = "{}:{}".format(config['listen_address'], config['listen_port']) -# return swagger_data -#api.add_resource(API_Doc, '/doc') +# class API_Doc(Resource): +# def get(self): +# """ +# Provide the Swagger API documentation +# --- +# tags: +# - root +# responses: +# 200: +# description: OK +# """ +# swagger_data = swagger(pvc_api.app) +# swagger_data['info']['version'] = API_VERSION +# swagger_data['info']['title'] = "PVC Client and Provisioner API" +# swagger_data['host'] = "{}:{}".format(config['listen_address'], config['listen_port']) +# return swagger_data +# api.add_resource(API_Doc, '/doc') # /login class API_Login(Resource): diff --git a/daemon-common/common.py b/daemon-common/common.py index 6ee31b0c..3fb622a2 100644 --- a/daemon-common/common.py +++ b/daemon-common/common.py @@ -559,7 +559,6 @@ def runRemoteCommand(node, command, become=False): ssh_client = paramiko.client.SSHClient() ssh_client.load_system_host_keys() ssh_client.set_missing_host_key_policy(DnssecPolicy()) - #ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) ssh_client.connect(node) stdin, stdout, stderr = ssh_client.exec_command(command) return stdout.read().decode('ascii').rstrip(), stderr.read().decode('ascii').rstrip() diff --git a/daemon-common/network.py b/daemon-common/network.py index 05f58972..68f2f1c7 100644 --- a/daemon-common/network.py +++ b/daemon-common/network.py @@ -532,7 +532,6 @@ def get_list(zk_conn, limit, is_fuzzy=True): else: net_list.append(getNetworkInformation(zk_conn, net)) - #output_string = formatNetworkList(zk_conn, net_list) return True, net_list def get_list_dhcp(zk_conn, network, limit, only_static=False, is_fuzzy=True): @@ -618,7 +617,6 @@ def get_list_acl(zk_conn, network, limit, direction, is_fuzzy=True): if valid_acl: acl_list.append(acl) - #output_string = formatACLList(zk_conn, net_vni, direction, acl_list) return True, acl_list # CLI-only functions diff --git a/node-daemon/pvcnoded/Daemon.py b/node-daemon/pvcnoded/Daemon.py index 3d9befe1..d04aa8a0 100644 --- a/node-daemon/pvcnoded/Daemon.py +++ b/node-daemon/pvcnoded/Daemon.py @@ -106,7 +106,6 @@ except Exception: # Set local hostname and domain variables myfqdn = gethostname() -#myfqdn = 'pvc-hv1.domain.net' myhostname = myfqdn.split('.', 1)[0] mydomainname = ''.join(myfqdn.split('.', 1)[1:]) try: