Further asyncio conversion work

confluent_server/bin/collective

@@ -162,4 +162,4 @@ async def main():
         await delete_member(cmdset.name)
 
 if __name__ == '__main__':
-    asyncio.get_event_loop().run_until_complete(main())
+    asyncio.run(main())

confluent_server/bin/osdeploy

@@ -510,7 +510,7 @@ async def rebase(profilename):
             sys.exit(rsp['errorcode'])
         else:
             print(repr(rsp))
-/opt/confluent/bin/confluent
+
 def oslist():
     c = client.Command()
     print("Distributions:")
@@ -598,4 +598,4 @@ async def osimport(imagefile, checkonly=False, custname=None):
                 pass
 
 if __name__ == '__main__':
-    asyncio.get_event_loop().run_until_complete(main(sys.argv))
+    asyncio.run(main(sys.argv))

confluent_server/confluent/certutil.py

@@ -317,8 +317,8 @@ async def create_certificate(keyout=None, certout=None, csrfile=None, subj=None,
         subj = '/CN={0}'.format(subj)
     if not csrfile:
         await util.check_call(
-            ['openssl', 'ecparam', '-name', 'secp384r1', '-genkey', '-out',
-             keyout])
+            'openssl', 'ecparam', '-name', 'secp384r1', '-genkey', '-out',
+             keyout)
     permitdomains = []
     if x509:
         # check if this CA has name constraints, and avoid violating them

confluent_server/confluent/consoleserver.py

@@ -619,7 +619,7 @@ async def start_console_sessions():
     await configmodule.hook_new_configmanagers(_start_tenant_sessions)
 
 
-async def connect_node(node, configmanager, username=None, direct=True, width=80,
+def connect_node(node, configmanager, username=None, direct=True, width=80,
                  height=24):
     attrval = configmanager.get_node_attributes(node, 'collective.manager')
     myc = attrval.get(node, {}).get('collective.manager', {}).get(