* Fix marvin test failure

* Add new marvin negative tests cases
* Remove hard-coded hypervisor types in marvin tests

Author: Dingane Hlaluku

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -4973,7 +4973,7 @@ protected void persistExtraConfigXenServer(String decodedUrl, UserVm vm) {
                     userVmDetailsDao.addDetail(vm.getId(), extraConfigKey + String.valueOf(i), cfg, true);
                     i++;
                 } else {
-                    throw new CloudRuntimeException("Configuration " + cfg + " contains a blacklisted key by Root admin");
+                    throw new CloudRuntimeException("Extra config " + cfg + " is not on the list of allowed keys for XenServer hypervisor hosts.");
                 }
             }
         } else {
@@ -5067,7 +5067,6 @@ protected void persistExtraConfigKvm(String decodedUrl, UserVm vm) {
      */
     protected void validateKvmExtraConfig(String decodedUrl) {
         String[] allowedConfigOptionList = KvmAdditionalConfigAllowList.value().split(",");
-        String msg = "An invalid extra configuration option has been supplied: ";
         // Skip allowed keys validation validation for DPDK
         if (!decodedUrl.contains(":")) {
             try {
@@ -5080,7 +5079,7 @@ protected void validateKvmExtraConfig(String decodedUrl) {
                     NodeList nodeList = doc.getElementsByTagName(tag.trim());
                     // Node list should not be empty to show that allowed command is contained in passed XML
                     if (nodeList.getLength() == 0) {
-                        throw new CloudRuntimeException(msg + tag);
+                        throw new CloudRuntimeException(String.format("Extra config %s is not on the list of allowed keys for KVM hypervisor hosts", tag));
                     }
                 }
             } catch (ParserConfigurationException | IOException | SAXException e) {

server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java

@@ -22,7 +22,6 @@
 import org.apache.cloudstack.api.BaseCmd.HTTPMethod;
 import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd;
 import org.apache.cloudstack.context.CallContext;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,6 +47,10 @@
 import com.cloud.vm.dao.UserVmDao;
 import com.cloud.vm.dao.UserVmDetailsDao;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 @RunWith(PowerMockRunner.class)
 public class UserVmManagerImplTest {
 
@@ -274,6 +277,18 @@ private void configureValidateOrReplaceMacAddressTest(int times, String macAddre
         String returnedMacAddress = userVmManagerImpl.validateOrReplaceMacAddress(macAddress, 1l);
 
         Mockito.verify(networkModel, Mockito.times(times)).getNextAvailableMacAddressInNetwork(Mockito.anyLong());
-        Assert.assertEquals(expectedMacAddress, returnedMacAddress);
+        assertEquals(expectedMacAddress, returnedMacAddress);
+    }
+
+    @Test
+    public void testValidatekeyValuePair() throws Exception {
+        assertTrue(userVmManagerImpl.isValidKeyValuePair("is-a-template=true\nHVM-boot-policy=\nPV-bootloader=pygrub\nPV-args=hvc0"));
+        assertTrue(userVmManagerImpl.isValidKeyValuePair("is-a-template=true HVM-boot-policy= PV-bootloader=pygrub PV-args=hvc0"));
+        assertTrue(userVmManagerImpl.isValidKeyValuePair("nvp.vm-uuid=34b3d5ea-1c25-4bb0-9250-8dc3388bfa9b"));
+        assertFalse(userVmManagerImpl.isValidKeyValuePair("key"));
+        //key-1=value1, param:key-2=value2, my.config.v0=False"
+        assertTrue(userVmManagerImpl.isValidKeyValuePair("key-1=value1"));
+        assertTrue(userVmManagerImpl.isValidKeyValuePair("param:key-2=value2"));
+        assertTrue(userVmManagerImpl.isValidKeyValuePair("my.config.v0=False"));
     }
 }