Merge pull request ottomatica#26 from gjabell/master

Slim only handles its own KVM machines (fix ottomatica#24)
gbraad · Jun 3, 2019 · a7c0c1f · a7c0c1f
2 parents 521bb85 + 34aa602
commit a7c0c1f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/providers/kvm.js b/lib/providers/kvm.js
@@ -71,7 +71,7 @@ class KVM {
     }
 
     async list() {
-        let output = (await this.exec(`list --all`)).toString();
+        let output = (await this.exec(`list --all --title`)).toString();
         // format is:
         // Id   Name    State
         // ------------------
@@ -81,14 +81,17 @@ class KVM {
             .split('\n')
             .splice(2,)
             .map(e => {
-                let [ id, name, state ] = e.trim().split(/\s+/);
+                let [ id, name, state, title ] = e.trim().split(/\s+/);
 
                 return {
                     id,
                     name,
-                    state
+                    state,
+                    title
                 };
-            });
+            })
+            .filter(e => e.title === 'slim')
+            .map(e => { delete e.title; return e });
     }
 
     async getSSHConfig(name) {

diff --git a/scripts/kvm.xml.mustache b/scripts/kvm.xml.mustache
@@ -1,5 +1,6 @@
 <domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
     <name>{{ name }}</name>
+    <title>slim</title>
     <os>
         <type>hvm</type>
         <kernel>{{ kernel }}</kernel>