Merge remote-tracking branch 'upstream/master' into devel

IM/config.py

@@ -103,6 +103,7 @@ class Config:
     VM_NUM_USE_CTXT_DIST = 30
     DELAY_BETWEEN_VM_RETRIES = 5
 
+
 config = ConfigParser()
 config.read([Config.IM_PATH + '/../im.cfg', Config.IM_PATH +
              '/../etc/im.cfg', '/etc/im/im.cfg'])
@@ -128,6 +129,7 @@ class ConfigOpenNebula:
     IMAGE_UNAME = ''
     TTS_URL = 'https://localhost:8443'
 
+
 if config.has_section("OpenNebula"):
     parse_options(config, 'OpenNebula', ConfigOpenNebula)
 

IM/db.py

@@ -227,6 +227,7 @@ def table_exists(self, table_name):
         else:
             return True
 
+
 try:
     class IntegrityError(sqlite.IntegrityError):
         """ Class to return IntegrityError independently of the DB used"""

IM/request.py

@@ -280,6 +280,7 @@ def serve_forever_in_thread(self):
         self.__thread.daemon = True
         self.__thread.start()
 
+
 if Config.XMLRCP_SSL:
     class AsyncSSLXMLRPCServer(ThreadingMixIn, SSLSimpleXMLRPCServer):
 

contextualization/ctxt_agent.py

@@ -630,6 +630,7 @@ def run(general_conf_file, vm_conf_file):
 
         return res_data['OK']
 
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Contextualization Agent.')
     parser.add_argument('general', type=str, nargs=1)

contextualization/ctxt_agent_dist.py

@@ -960,6 +960,7 @@ def run(general_conf_file, vm_conf_file, local):
 
         return res_data['OK']
 
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Contextualization Agent.')
     parser.add_argument('general', type=str, nargs=1)

im_service.py

@@ -373,6 +373,7 @@ def signal_int_handler(signal, frame):
     """
     im_stop()
 
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='IM service')
     parser.add_argument('--version', help='Show IM service version.', dest="version",

scripts/db_1_4_to_1_5.py

@@ -105,6 +105,7 @@ def complete_data():
                 vm.cloud_connector = None
                 vm.inf = None
 
+
 if __name__ == "__main__":
     if not Config.DATA_DB:
         sys.stderr.write("No DATA_DB defined in the im.cfg file!!")

scripts/delete_old_infs.py

@@ -36,6 +36,7 @@ def delete_data_from_db(db_url, date):
             sys.stderr.write("ERROR connecting with the database!.")
             sys.exit(-1)
 
+
 if __name__ == "__main__":
     if not Config.DATA_DB:
         sys.stderr.write("No DATA_DB defined in the im.cfg file!!\n")

test/functional/test_im.py

@@ -182,5 +182,6 @@ def test_inf_lifecycle(self):
 
         IM.DestroyInfrastructure(infId, auth0)
 
+
 if __name__ == "__main__":
     unittest.main()

test/integration/QuickTestIM.py

@@ -541,5 +541,6 @@ def test_75_destroy(self):
         self.assertTrue(
             success, msg="ERROR calling DestroyInfrastructure: " + str(res))
 
+
 if __name__ == '__main__':
     unittest.main()

test/integration/TestIM.py

@@ -685,5 +685,6 @@ def test_95_destroy(self):
             self.assertTrue(
                 success, msg="ERROR calling DestroyInfrastructure: " + str(res))
 
+
 if __name__ == '__main__':
     unittest.main()

test/integration/TestREST.py

@@ -477,5 +477,6 @@ def test_98_destroy(self):
         self.assertEqual(resp.status_code, 200,
                          msg="ERROR destroying the infrastructure:" + resp.text)
 
+
 if __name__ == '__main__':
     unittest.main()

test/integration/TestREST_JSON.py

@@ -201,5 +201,6 @@ def test_95_destroy(self):
         self.assertEqual(resp.status_code, 200,
                          msg="ERROR destroying the infrastructure:" + resp.text)
 
+
 if __name__ == '__main__':
     unittest.main()

test/loadtest/LoadTest.py

@@ -371,6 +371,7 @@ def test(num_client):
     now = datetime.datetime.now()
     print(now, ": End client num: %d" % num_client)
 
+
 if __name__ == '__main__':
     MAX_THREADS = 1
     MAX_CLIENTS = 1

test/loadtest/LoadTestR.py

@@ -118,6 +118,7 @@ def test(num_client):
     now = datetime.datetime.now()
     print(now, ": End client num: %d" % num_client)
 
+
 if __name__ == '__main__':
     MAX_THREADS = 1
     MAX_CLIENTS = 1

test/loadtest/LoadTestREST.py

@@ -330,6 +330,7 @@ def test(num_client):
     now = datetime.datetime.now()
     print(now, ": End client num: %d" % num_client)
 
+
 if __name__ == '__main__':
     MAX_THREADS = 1
     MAX_CLIENTS = 1

test/loadtest/LoadTestRESTR.py

@@ -120,6 +120,7 @@ def test(num_client):
     now = datetime.datetime.now()
     print(now, ": End client num: %d" % num_client)
 
+
 if __name__ == '__main__':
     MAX_THREADS = 1
     MAX_CLIENTS = 1

test/unit/REST.py

@@ -779,5 +779,6 @@ def test_format_output(self, get_media_type):
         info = format_output(["1", "2"])
         self.assertEqual(info, 'Unsupported Accept Media Types: application/zip')
 
+
 if __name__ == "__main__":
     unittest.main()

test/unit/ServiceRequests.py

@@ -172,5 +172,6 @@ def test_version(self, inflist):
         req = IM.ServiceRequests.IMBaseRequest.create_request(IM.ServiceRequests.IMBaseRequest.GET_VERSION)
         req._call_function()
 
+
 if __name__ == '__main__':
     unittest.main()

test/unit/Tosca.py

@@ -92,5 +92,6 @@ def test_tosca_get_outputs(self):
                                                     'token': 'pass',
                                                     'user': 'ubuntu'}})
 
+
 if __name__ == "__main__":
     unittest.main()

test/unit/VMRC.py

@@ -98,5 +98,6 @@ def test_list_vm(self, suds_cli):
         self.assertEqual(res_radl[0].getValue("disk.0.os.credentials.password"), "pass")
         self.assertEqual(res_radl[0].getValue("disk.0.os.credentials.username"), "user")
 
+
 if __name__ == '__main__':
     unittest.main()

test/unit/connectors/GCE.py

@@ -406,5 +406,6 @@ def test_70_get_custom_instance(self):
         instance = gce_cloud.get_instance_type(sizes, radl.systems[0])
         self.assertEquals(instance.name, "sizenamne")
 
+
 if __name__ == '__main__':
     unittest.main()

test/unit/connectors/OpenNebula.py

@@ -390,5 +390,6 @@ def test_80_delete_image(self, sleep, getONEVersion, server_proxy):
         self.assertEqual(one_server.one.image.delete.call_args_list[1], call('user:pass', 1))
         self.assertNotIn("ERROR", self.log.getvalue(), msg="ERROR found in log: %s" % self.log.getvalue())
 
+
 if __name__ == '__main__':
     unittest.main()

test/unit/db.py

@@ -62,5 +62,6 @@ def test_db(self, mdb_conn):
 
         db.close()
 
+
 if __name__ == '__main__':
     unittest.main()

test/unit/onetts.py

@@ -47,5 +47,6 @@ def test_list_providers(self, ttscli):
         self.assertEqual(username, "username", msg="ERROR: getting one auth from TTS, incorrect username.")
         self.assertEqual(password, "password", msg="ERROR: getting one auth from TTS, incorrect password.")
 
+
 if __name__ == '__main__':
     unittest.main()

test/unit/openid.py

@@ -74,5 +74,6 @@ def test_get_token_introspection(self, requests):
         self.assertTrue(success)
         self.assertEqual(json.loads(token_info), token_info_resp)
 
+
 if __name__ == '__main__':
     unittest.main()

test/unit/recipe.py

@@ -51,5 +51,6 @@ def test_recipe(self, DataBase):
         self.assertEqual(res[0][1], "mod")
         self.assertEqual(res[0][2], "gmod")
 
+
 if __name__ == '__main__':
     unittest.main()

test/unit/test_ansible.py

@@ -49,5 +49,6 @@ def test_ansible_thread(self):
         self.assertIn("changed=2", output.getvalue())
         print(output.getvalue())
 
+
 if __name__ == '__main__':
     unittest.main()

test/unit/test_ctxt_agent.py

@@ -242,5 +242,6 @@ def test_90_replace_vm_ip(self):
             data = f.read()
         self.assertIn(" ansible_host=%s ansible_ssh_host=%s \n" % (vm_data['ctxt_ip'], vm_data['ctxt_ip']), data)
 
+
 if __name__ == '__main__':
     unittest.main()

test/unit/test_ctxt_agent_dist.py

@@ -279,5 +279,6 @@ def test_90_replace_vm_ip(self):
         self.assertIn(" ansible_host=%s \n" % vm_data['ctxt_ip'], data)
         self.assertIn(" ansible_ssh_host=%s \n" % vm_data['ctxt_ip'], data)
 
+
 if __name__ == '__main__':
     unittest.main()

test/unit/test_im_logic.py

@@ -1210,5 +1210,6 @@ def test_create_async(self):
 
         IM.DestroyInfrastructure(infId, auth0)
 
+
 if __name__ == "__main__":
     unittest.main()

test/unit/timedcall.py

@@ -57,5 +57,6 @@ def test_timer(self):
             time.sleep(0.1)
         self.assertEqual(res, 4)
 
+
 if __name__ == '__main__':
     unittest.main()

test/unit/tts.py

@@ -108,5 +108,7 @@ def test_request_credential(self, requests):
 
         self.assertTrue(success, msg="ERROR: getting credentials: %s." % cred)
         self.assertEqual(cred, expected_cred, msg="ERROR: getting credentials: Unexpected credetials.")
+
+
 if __name__ == '__main__':
     unittest.main()

test/unit/xmlobject.py

@@ -78,5 +78,6 @@ def test_timed_call(self):
                     '<MEMORY>512</MEMORY>\n</TEMPLATE>\n')
         self.assertEqual(res, expected)
 
+
 if __name__ == '__main__':
     unittest.main()