Merge remote-tracking branch 'origin/4.13'

Author: yadvr

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertSnapshotCommandWrapper.java

@@ -86,14 +86,16 @@ public Answer execute(final RevertSnapshotCommand command, final LibvirtComputin
                 rados.connect();
 
                 String[] rbdPoolAndVolumeAndSnapshot = snapshotRelPath.split("/");
+                int snapshotIndex = rbdPoolAndVolumeAndSnapshot.length - 1;
+                String rbdSnapshotId = rbdPoolAndVolumeAndSnapshot[snapshotIndex];
 
                 IoCTX io = rados.ioCtxCreate(primaryPool.getSourceDir());
                 Rbd rbd = new Rbd(io);
-                RbdImage image = rbd.open(rbdPoolAndVolumeAndSnapshot[1]);
 
-                s_logger.debug(String.format("Attempting to rollback RBD snapshot [name:%s], [pool:%s], [volumeid:%s], [snapshotid:%s]", snapshot.getName(),
-                        rbdPoolAndVolumeAndSnapshot[0], rbdPoolAndVolumeAndSnapshot[1], rbdPoolAndVolumeAndSnapshot[2]));
-                image.snapRollBack(rbdPoolAndVolumeAndSnapshot[2]);
+                s_logger.debug(String.format("Attempting to rollback RBD snapshot [name:%s], [volumeid:%s], [snapshotid:%s]", snapshot.getName(), volumePath, rbdSnapshotId));
+
+                RbdImage image = rbd.open(volumePath);
+                image.snapRollBack(rbdSnapshotId);
 
                 rbd.close(image);
                 rados.ioCtxDestroy(io);

systemvm/debian/opt/cloud/bin/cs/CsRoute.py

@@ -79,7 +79,7 @@ def set_route(self, cmd, method="add"):
         found = False
         search = cmd
         if "throw" in search:
-            search = "type " + search
+            search = search.replace("throw", "")
         for i in CsHelper.execute("ip route show " + search):
             found = True
         if not found and method == "add":