Enable Flake8 rule W391 ()%22,%22shortMessageMarkdownLink%22:null,%22bodyMessageHtml%22:%22Best practice is to have one blank line at the end of Python files. Remove unneeded blank lines from the end of files

jbampton · web-flow · commit 8e538028b23c · 2022-11-13T11:00:07.000+01:00
diff --git a/.github/linters/.flake8 b/.github/linters/.flake8
@@ -15,5 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
+# W291 Trailing whitespace
+# W292 No newline at end of file
+# W293 Blank line contains whitespace
+# W391 Blank line at end of file
+
 [flake8]
-select = W291,W292,W293
+select = W291,W292,W293,W391
diff --git a/cloud-cli/cloudapis/__init__.py b/cloud-cli/cloudapis/__init__.py
@@ -40,4 +40,3 @@ def lookup_api(api_name):
     else: api = matchingapi[0]
     if api: api = getattr(api,"implementor")
     return api
-
diff --git a/cloud-cli/cloudapis/cloud.py b/cloud-cli/cloudapis/cloud.py
@@ -194,5 +194,3 @@ def %s(%s):
 implementor = CloudAPI
 
 del name,meth,describe,load_dynamic_methods
-
-
diff --git a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/ConfigFileOps.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/ConfigFileOps.py
@@ -172,4 +172,3 @@ def backup(self):
                 self.add_lines(oldLine, False)
             else:
                 self.replace_lines(newLine, oldLine, False)
-
diff --git a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmCommonModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmCommonModule.py
@@ -156,4 +156,3 @@ def makeOwnerFileName():
     hostIp = successToMap(get_master_ip())['ip']
     ownerFileName = OWNER_FILE_PREFIX + hostIp.replace('.', '_')
     return ownerFileName
-
diff --git a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmHaHeartBeatModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmHaHeartBeatModule.py
@@ -102,4 +102,3 @@ def setupHeartBeat():
             stopOldHeartBeat(pid)
 
         setupHeartBeat()
-
diff --git a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmOCFS2Module.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmOCFS2Module.py
@@ -77,4 +77,3 @@ def _start(self, cluster):
         doCmd(cmd)
         cmd = ['service o2cb start %s'%cluster]
         doCmd(cmd)
-
diff --git a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmSecurityGroupModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmSecurityGroupModule.py
@@ -438,41 +438,3 @@ def check_rule_log_for_vm(vm_name, vm_id, vm_ip, dom_id, signature, seqno):
             return [True, True, True, True, True, True]
 
         return [(vm_name != _vm_name), (vm_id != _vm_id), (vm_ip != _vm_ip), (dom_id != _dom_id), (signature != _signature), (seqno != _seqno)]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmStoragePoolModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmStoragePoolModule.py
@@ -427,5 +427,3 @@ def copyToPrimary(secMountPoint, volumeFolderOnSecStorage, volumePath, primaryMo
             errmsg = fmt_err_msg(e)
             logger.error(OvmStoragePool.copyVolume, errmsg)
             raise XmlRpcFault(toErrCode(OvmStoragePool, OvmStoragePool.copyVolume), errmsg)
-
-
diff --git a/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmVolumeModule.py b/plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmVolumeModule.py
@@ -153,6 +153,3 @@ def destroy(poolUuid, path):
 
 if __name__ == "__main__":
     print OvmVolume.detachOrAttachIso(sys.argv[1], '', False)
-
-
-
diff --git a/python/lib/cloud_utils.py b/python/lib/cloud_utils.py
@@ -679,4 +679,3 @@ def commit(self):raise NotImplementedError
 	def rollback(self):raise NotImplementedError
 	def get_schema_level(self):raise NotImplementedError
 	def set_schema_level(self,l):raise NotImplementedError
-
diff --git a/python/lib/cloudutils/networkConfig.py b/python/lib/cloudutils/networkConfig.py
@@ -163,4 +163,3 @@ def getDevInfo(dev):
             type = "dev"
 
         return networkConfig.devInfo(macAddr, ipAddr, netmask, None, type, dev)
-
diff --git a/scripts/network/exdhcp/dhcpd_edithosts.py b/scripts/network/exdhcp/dhcpd_edithosts.py
@@ -120,4 +120,3 @@ def insert_host_entry(mac, ip, hostname, dns, gateway, next_server):
 
 	ret = insert_host_entry(mac, ip, hostname, dns, gateway, next_server)
 	sys.exit(ret)
-
diff --git a/scripts/network/ping/prepare_kickstart_kernel_initrd.py b/scripts/network/ping/prepare_kickstart_kernel_initrd.py
@@ -72,4 +72,3 @@ def copy_from_nfs(src, dst):
 
     (kernel, initrd, copy_to) = sys.argv[1:]
     sys.exit(prepare())
-
diff --git a/scripts/vm/hypervisor/xenserver/perfmon.py b/scripts/vm/hypervisor/xenserver/perfmon.py
@@ -258,4 +258,3 @@ def get_vm_group_perfmon(args={}):
                 else:
                     result += ',' + str(vm_count) +  '.' +  str(counter_count) + ':' + str(average_memory)
     return result
-
diff --git a/scripts/vm/network/vnet/ovstunnel.py b/scripts/vm/network/vnet/ovstunnel.py
@@ -309,4 +309,3 @@ def get_field_of_interface(iface_name, field):
     else:
         logging.debug("Unknown command: " + cmd)
         sys.exit(1)
-
diff --git a/test/integration/broken/test_ps_resource_limits_volume.py b/test/integration/broken/test_ps_resource_limits_volume.py
@@ -169,4 +169,3 @@ def test_attach_volume_exceeding_primary_limits(self):
         self.assertEqual(response[0], PASS, response[1])
 
         return
-
diff --git a/test/integration/broken/test_vr_metadata.py b/test/integration/broken/test_vr_metadata.py
@@ -334,4 +334,3 @@ def test_deployVM_verify_metadata_in_VR_after_migration(self):
                               )
 
         return
-
diff --git a/test/integration/component/maint/test_ip_resource_count_for_vpc.py b/test/integration/component/maint/test_ip_resource_count_for_vpc.py
@@ -349,5 +349,3 @@ def test_01_ip_resource_count_vpc_network(self):
         account_list = Account.list(self.apiclient, id=self.account.id)
         totalip = account_list[0].iptotal
         self.assertTrue(totalip - totalip_1 == 3, "publicip count is 3")
-
-
diff --git a/test/integration/component/test_acl_isolatednetwork_delete.py b/test/integration/component/test_acl_isolatednetwork_delete.py
@@ -546,4 +546,3 @@ def createNetwork(cls,apiclient,account,isolated_network_offering_id,zone):
         )
         cls._cleanup.append(network)
         return network
-
diff --git a/test/integration/component/test_acl_sharednetwork.py b/test/integration/component/test_acl_sharednetwork.py
@@ -1124,5 +1124,3 @@ def generateKeysForUser(apiclient,account):
                         apiclient,
                         user.id
                       ))
-
-
diff --git a/test/integration/component/test_affinity_groups_projects.py b/test/integration/component/test_affinity_groups_projects.py
@@ -1082,6 +1082,3 @@ def test_02_deploy_vm_anti_affinity_group_fail_on_not_enough_hosts(self):
 
         wait_for_cleanup(self.api_client, ["expunge.delay", "expunge.interval"])
         self.cleanup.append(aff_grp)
-
-
-
diff --git a/test/integration/component/test_baremetal.py b/test/integration/component/test_baremetal.py
@@ -120,4 +120,3 @@ def test_baremetal(self):
         cmd.endip = "10.1.1.40"
         cmd.forVirtualNetwork="false"
         self.apiclient.createVlanIpRange(cmd)
-
diff --git a/test/integration/component/test_brocade_vcs.py b/test/integration/component/test_brocade_vcs.py
@@ -329,4 +329,3 @@ def test_network_vcs(self):
         Network.delete(self.network, self.apiclient)
 
         return
-
diff --git a/test/integration/component/test_concurrent_create_volume_from_snapshot.py b/test/integration/component/test_concurrent_create_volume_from_snapshot.py
@@ -303,4 +303,3 @@ def test_01_snapshot_root_disk(self):
         )
 
         return
-
diff --git a/test/integration/component/test_dhcp_dns_offload.py b/test/integration/component/test_dhcp_dns_offload.py
@@ -2124,4 +2124,3 @@ def test_33_verify_config_params_TC65(self):
                 self.debug("Success: Updating dhcp config params with invalid values is not allowed\
                            and throws following message: %s" % e)
         return
-
diff --git a/test/integration/component/test_egress_rules.py b/test/integration/component/test_egress_rules.py
@@ -2125,6 +2125,3 @@ def test_invalid_parameters(self):
                                     domainid=self.account.domainid
                                     )
         return
-
-
-
diff --git a/test/integration/component/test_escalations_instances.py b/test/integration/component/test_escalations_instances.py
@@ -4492,6 +4492,3 @@ def test_25_ip_reallocation_ES1377(self):
                 "Warning: Exception in expunging vms vm3 and vm4 : %s" %
                 e)
         return
-
-
-
diff --git a/test/integration/component/test_escalations_templates.py b/test/integration/component/test_escalations_templates.py
@@ -861,6 +861,3 @@ def test_04_copy_template(self):
             )
         del self.services["privatetemplate"]["ostype"]
         return
-
-
-
diff --git a/test/integration/component/test_escalations_vmware.py b/test/integration/component/test_escalations_vmware.py
@@ -367,6 +367,3 @@ def test_04_check_vm_snapshot_creation_after_Instance_creation(self):
             snapshot_created_1,
             "VM Snapshot creation failed"
         )
-
-
-
diff --git a/test/integration/component/test_hypervisor_capabilities.py b/test/integration/component/test_hypervisor_capabilities.py
@@ -286,4 +286,3 @@ def listHostHypervisorCapabilities(self, id, hypervisor=None):
         cmd = listHypervisorCapabilities.listHypervisorCapabilitiesCmd()
         cmd.id = id
         return self.apiclient.listHypervisorCapabilities(cmd)
-
diff --git a/test/integration/component/test_invalid_gw_nm.py b/test/integration/component/test_invalid_gw_nm.py
@@ -124,4 +124,3 @@ def test_isolated_nw_invalid_gw(self):
                 netmask="255.0.255.0",
             )
         return
-
diff --git a/test/integration/component/test_ldap.py b/test/integration/component/test_ldap.py
@@ -304,4 +304,3 @@ def _checklogin(self, username, password):
         except Exception as p:
             self.debug("login operation failed %s" % p)
             self.reason = "Login operation Failed %s" % p
-
diff --git a/test/integration/component/test_ldap_auto_import.py b/test/integration/component/test_ldap_auto_import.py
@@ -594,5 +594,3 @@ def test_11_ldap(self):
             "", "", self.parent_domain.name, method="POST")
         self.debug(loginRes)
         self.assertEqual(loginRes, None, self.reason)
-
-
diff --git a/test/integration/component/test_multiple_nic_support.py b/test/integration/component/test_multiple_nic_support.py
@@ -621,4 +621,3 @@ def test_09_reboot_vm_with_multiple_nic(self):
             self.fail("Exception occurred: %s" % e)
 
         self.verify_network_rules(self.virtual_machine1.id)
-
diff --git a/test/integration/component/test_redundant_router_services.py b/test/integration/component/test_redundant_router_services.py
@@ -380,4 +380,3 @@ def test_enableVPNOverRvR(self):
                          "List remote VPNs should not return empty response"
                          )
         return
-
diff --git a/test/integration/plugins/solidfire/TestAddRemoveHosts.py b/test/integration/plugins/solidfire/TestAddRemoveHosts.py
@@ -955,4 +955,3 @@ def _connect_to_hypervisor(cls):
             xen_server = cls.testdata[TestData.xenServer]
 
             cls.xen_session.xenapi.login_with_password(xen_server[TestData.username], xen_server[TestData.password])
-
diff --git a/test/integration/plugins/solidfire/TestManagedSystemVMs.py b/test/integration/plugins/solidfire/TestManagedSystemVMs.py
@@ -624,4 +624,3 @@ def _connect_to_hypervisor(cls):
             xen_server = cls.testdata[TestData.xenServer]
 
             cls.xen_session.xenapi.login_with_password(xen_server[TestData.username], xen_server[TestData.password])
-
diff --git a/test/integration/plugins/solidfire/TestSnapshots.py b/test/integration/plugins/solidfire/TestSnapshots.py
@@ -1767,4 +1767,3 @@ def _delete_and_test_snapshot_2(self, vol_snap, sf_account_id, expected_num_volu
         sf_volumes = sf_util.get_active_sf_volumes(self.sfe, sf_account_id)
 
         sf_util.check_list(sf_volumes, expected_num_volumes, self, volume_err_msg)
-
diff --git a/test/integration/plugins/solidfire/TestVolumes.py b/test/integration/plugins/solidfire/TestVolumes.py
@@ -2710,4 +2710,3 @@ def _connect_to_hypervisor(cls):
             xen_server = cls.testdata[TestData.xenServer]
 
             cls.xen_session.xenapi.login_with_password(xen_server[TestData.username], xen_server[TestData.password])
-
diff --git a/test/integration/plugins/storpool/TestStorPoolVolumes.py b/test/integration/plugins/storpool/TestStorPoolVolumes.py
@@ -2149,5 +2149,3 @@ def getCfgFromUrl(cls, url):
         host, port = cfg['SP_API_HTTP'].split(':')
         auth = cfg['SP_AUTH_TOKEN']
         return host, int(port), auth
-
-
diff --git a/test/integration/plugins/storpool/sp_util.py b/test/integration/plugins/storpool/sp_util.py
@@ -745,4 +745,3 @@ def start(cls, apiclient, vmid, hostid):
         cmd.id = vmid
         cmd.hostid = hostid
         return (apiclient.startVirtualMachine(cmd))
-
diff --git a/test/integration/smoke/test_create_network.py b/test/integration/smoke/test_create_network.py
@@ -289,4 +289,3 @@ def test_02_create_network_with_same_name(self):
         )
 
         self.cleanup.append(self.network_offering)
-
diff --git a/test/integration/smoke/test_deploy_vm_root_resize.py b/test/integration/smoke/test_deploy_vm_root_resize.py
@@ -394,6 +394,3 @@ def test_02_deploy_vm_root_resize(self):
             self.assertEqual(success, True, "Check if passing rootdisksize < templatesize fails appropriately")
         else:
             self.debug("test 02 does not support hypervisor type " + self.hypervisor)
-
-
-
diff --git a/test/integration/smoke/test_enable_role_based_users_in_projects.py b/test/integration/smoke/test_enable_role_based_users_in_projects.py
@@ -268,4 +268,3 @@ def test_add_multiple_admins_in_project(self):
             )
         except Exception as e:
             pass
-
diff --git a/test/integration/smoke/test_metrics_api.py b/test/integration/smoke/test_metrics_api.py
@@ -376,4 +376,3 @@ def valid_date(cls, date_text):
             return True
         except ValueError:
             return False
-
diff --git a/test/integration/smoke/test_network_permissions.py b/test/integration/smoke/test_network_permissions.py
@@ -791,4 +791,4 @@ def test_06_list_networks_under_account(self):
 
         self.remove_network_permission(self.apiclient, self.user_network, self.other_user, None, expected=True)
         self.list_network(self.apiclient, self.other_user, self.user_network, None, None, expected=False)
-        self.list_network(self.otheruser_apiclient, self.other_user, self.user_network, None, None, expected=False)
+        self.list_network(self.otheruser_apiclient, self.other_user, self.user_network, None, None, expected=False)
diff --git a/test/integration/smoke/test_non_contigiousvlan.py b/test/integration/smoke/test_non_contigiousvlan.py
@@ -88,4 +88,3 @@ def tearDown(self):
         updateResponse = self.network.update(self.apiClient, id = self.networkid, vlan=self.existing_vlan)
         self.assertTrue(updateResponse.vlan.find(self.vlan["full_range"]) < 0,
             "VLAN was not removed successfully")
-
diff --git a/test/integration/testpaths/testpath_delta_snapshots.py b/test/integration/testpaths/testpath_delta_snapshots.py
@@ -537,4 +537,3 @@ def test_01_delta_snapshots(self):
             "Check: Snapshot 1 is still on Secondary Storage. Not Deleted.")
 
         return
-
diff --git a/test/selenium/browser/firefox.py b/test/selenium/browser/firefox.py
@@ -53,4 +53,3 @@ def quit_browser(self):
     browser.set_url("http://10.88.90.84:8080/client/")
     time.sleep(3)
     browser.quit_browser()
-
diff --git a/test/selenium/common/__init__.py b/test/selenium/common/__init__.py
@@ -14,5 +14,3 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
-
diff --git a/test/selenium/common/shared.py b/test/selenium/common/shared.py
@@ -146,4 +146,3 @@ def wait_for_invisible(browser, element_type, name, waittime=30):
 
         #this method isn't as slick as I hoped :(
         time.sleep(1)
-
diff --git a/test/selenium/cspages/__init__.py b/test/selenium/cspages/__init__.py
@@ -14,5 +14,3 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
-
diff --git a/test/selenium/cspages/cspage.py b/test/selenium/cspages/cspage.py
@@ -18,4 +18,3 @@
 class CloudStackPage(object):
     def __init__():
         self.browser = None
-
diff --git a/test/selenium/cspages/dashboard/__init__.py b/test/selenium/cspages/dashboard/__init__.py
@@ -14,5 +14,3 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
-
diff --git a/test/selenium/cspages/dashboard/dashboardpage.py b/test/selenium/cspages/dashboard/dashboardpage.py
@@ -71,4 +71,3 @@ def navigate_to(self, item_name):
                 li.click()
                 time.sleep(3)
                 return
-
diff --git a/test/selenium/cspages/login/__init__.py b/test/selenium/cspages/login/__init__.py
@@ -14,5 +14,3 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
-
diff --git a/test/selenium/cstests/__init__.py b/test/selenium/cstests/__init__.py
@@ -14,4 +14,3 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
diff --git a/test/selenium/cstests/regressiontests/__init__.py b/test/selenium/cstests/regressiontests/__init__.py
@@ -14,4 +14,3 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
diff --git a/test/selenium/cstests/smoketests/__init__.py b/test/selenium/cstests/smoketests/__init__.py
@@ -14,4 +14,3 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
diff --git a/test/selenium/cstests/smoketests/smokecfg.py b/test/selenium/cstests/smoketests/smokecfg.py
@@ -60,4 +60,3 @@
                                },
 
            }
-
diff --git a/test/selenium/lib/Global_Locators.py b/test/selenium/lib/Global_Locators.py
@@ -220,5 +220,3 @@
 
 # Click ok to login
 login_submit_css = "body.login > div.login > form > div.fields > input[type=\"submit\"]" # Login>Login Button (Submit button)
-
-
diff --git a/test/selenium/smoke/main.py b/test/selenium/smoke/main.py
@@ -140,6 +140,3 @@
 
 # Leave following as is for either XML or HTML
 runner.run(suite)
-
-
-
diff --git a/tools/marvin/marvin/cloudstackException.py b/tools/marvin/marvin/cloudstackException.py
@@ -92,4 +92,3 @@ def verifyErrorCodeinException(e,errorCode):
             return True
         else:
             return False
-
diff --git a/tools/marvin/marvin/lib/utils.py b/tools/marvin/marvin/lib/utils.py
@@ -551,4 +551,3 @@ def wait_until(retry_interval=2, no_of_times=2, callback=None, *callback_args):
             break
 
     return wait_result, return_val
-
diff --git a/tools/marvin/marvin/misc/build/bashUtils.py b/tools/marvin/marvin/misc/build/bashUtils.py
diff --git a/tools/marvin/marvin/misc/build/restartMgmt.py b/tools/marvin/marvin/misc/build/restartMgmt.py
diff --git a/tools/marvin/marvin/sandbox/__init__.py b/tools/marvin/marvin/sandbox/__init__.py
diff --git a/tools/marvin/marvin/sandbox/advanced/__init__.py b/tools/marvin/marvin/sandbox/advanced/__init__.py
diff --git a/tools/marvin/marvin/sandbox/advancedsg/__init__.py b/tools/marvin/marvin/sandbox/advancedsg/__init__.py
diff --git a/tools/marvin/marvin/sandbox/basic/__init__.py b/tools/marvin/marvin/sandbox/basic/__init__.py
diff --git a/tools/marvin/marvin/sandbox/demo/__init__.py b/tools/marvin/marvin/sandbox/demo/__init__.py
diff --git a/tools/marvin/marvin/sandbox/demo/live/__init__.py b/tools/marvin/marvin/sandbox/demo/live/__init__.py
diff --git a/tools/marvin/marvin/sandbox/demo/simulator/__init__.py b/tools/marvin/marvin/sandbox/demo/simulator/__init__.py
diff --git a/tools/marvin/marvin/sandbox/demo/simulator/testcase/__init__.py b/tools/marvin/marvin/sandbox/demo/simulator/testcase/__init__.py
diff --git a/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/__init__.py b/tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/__init__.py

Original file line number	Diff line number	Diff line change
`@@ -102,4 +102,3 @@ def setupHeartBeat():`
`102`	`102`	`stopOldHeartBeat(pid)`
`103`	`103`
`104`	`104`	`setupHeartBeat()`
`105`		`-`