javascriptextjs
diff --git a/‎test/integration/component/test_coreos.py‎
Lines changed: 0 additions & 292 deletions b/‎test/integration/component/test_coreos.py‎
Lines changed: 0 additions & 292 deletions
diff --git a/‎tools/marvin/marvin/config/test_data.py‎
Lines changed: 0 additions & 12 deletions b/‎tools/marvin/marvin/config/test_data.py‎
Lines changed: 0 additions & 12 deletions
diff --git a/‎tools/marvin/marvin/lib/base.py‎
Lines changed: 1 addition & 7 deletions b/‎tools/marvin/marvin/lib/base.py‎
Lines changed: 1 addition & 7 deletions
@@ -790,18 +790,6 @@
         "format": "OVA",
         "ispublic": "true"
     },
-    "coreos": {
-        "displaytext": "coreos",
-        "name": "coreos",
-        "passwordenabled": False,
-        "ostype": "Coreos",
-        "urlvmware":"http://10.147.28.7/templates/coreos/coreos_production_vmware.ova",
-        "urlxen":"http://dl.openvm.eu/cloudstack/coreos/x86_64/"
-                 "coreos_production_cloudstack_image-xen.vhd.bz2",
-        "urlkvm": "http://dl.openvm.eu/cloudstack/coreos/x86_64/" \
-                         "coreos_production_cloudstack_image-kvm.qcow2.bz2",
-        "urlhyperv":"http://dl.openvm.eu/cloudstack/coreos/x86_64/coreos_production_cloudstack_image-hyperv.vhd.zip"
-        },
     "template_2": {
         "displaytext": "Public Template",
         "name": "Public template",
 
@@ -551,7 +551,7 @@ def restore(self, apiclient, templateid=None):
 
     def get_ssh_client(
             self, ipaddress=None, reconnect=False, port=None,
-            keyPairFileLocation=None,username=None,password=None, retries=20):
+            keyPairFileLocation=None, retries=20):
         """Get SSH object of VM"""
 
         # If NAT Rules are not created while VM deployment in Advanced mode
@@ -564,12 +564,6 @@ def get_ssh_client(
         if keyPairFileLocation is not None:
             self.password = None
 
-        if username is not None:
-            self.username=username
-
-        if password is not None:
-            self.password=password
-
         if reconnect:
             self.ssh_client = is_server_ssh_ready(
                 self.ssh_ip,