guestip -> ip

Author: baslr

lib/parser.js

@@ -183,18 +183,18 @@ class Parser {
       let ext = 'user';
 
       if (opts.hostToVmPortFwd || opts.vmToHostPortFwd) {
-        ext = `${ext},dhcpstart=${opts.guestIp}`;
+        ext = `${ext},dhcpstart=${opts.ip}`;
 
         if (opts.hostToVmPortFwd) {
           ext = opts.hostToVmPortFwd.reduce( (prev, fwd) => {
-            return `${prev},hostfwd=tcp:${fwd.hostIp}:${fwd.hostPort}-${opts.guestIp}:${fwd.guestPort}`;
+            return `${prev},hostfwd=tcp:${fwd.hostIp}:${fwd.hostPort}-${opts.ip}:${fwd.guestPort}`;
           }, ext);
         } // if
 
         // guestfwd=tcp:10.0.2.100:1234-tcp:10.10.1.1:4321
         if (opts.vmToHostPortFwd) {
           ext = opts.vmToHostPortFwd.reduce( (prev, fwd) => {
-            return `${prev},guestfwd=tcp:${opts.guestIp}:${fwd.guestPort}-${fwd.hostIp}:${fwd.hostPort}`;
+            return `${prev},guestfwd=tcp:${opts.ip}:${fwd.guestPort}-${fwd.hostIp}:${fwd.hostPort}`;
           }, ext);
         } // if
       } // if

tests.js

@@ -49,11 +49,11 @@ const tests = [
 
 // net
 ,['net', ['myMacAddr', 'myCard', 'user'], ['-net', 'nic,model=myCard,macaddr=myMacAddr', '-net', 'user']]
-,['net', ['myMacAddr', 'myCard', 'user', {guestIp:'gIp',hostToVmPortFwd:[{hostIp:'hIp',hostPort:'hPort', guestPort:'gPort'}]}], ['-net', 'nic,model=myCard,macaddr=myMacAddr', '-net', 'user,dhcpstart=gIp,hostfwd=tcp:hIp:hPort-gIp:gPort']]
-,['net', ['myMacAddr', 'myCard', 'user', {guestIp:'gIp',vmToHostPortFwd:[{hostIp:'hIp',hostPort:'hPort', guestPort:'gPort'}]}], ['-net', 'nic,model=myCard,macaddr=myMacAddr', '-net', 'user,dhcpstart=gIp,guestfwd=tcp:gIp:gPort-hIp:hPort']]
+,['net', ['myMacAddr', 'myCard', 'user', {ip:'gIp',hostToVmPortFwd:[{hostIp:'hIp',hostPort:'hPort', guestPort:'gPort'}]}], ['-net', 'nic,model=myCard,macaddr=myMacAddr', '-net', 'user,dhcpstart=gIp,hostfwd=tcp:hIp:hPort-gIp:gPort']]
+,['net', ['myMacAddr', 'myCard', 'user', {ip:'gIp',vmToHostPortFwd:[{hostIp:'hIp',hostPort:'hPort', guestPort:'gPort'}]}], ['-net', 'nic,model=myCard,macaddr=myMacAddr', '-net', 'user,dhcpstart=gIp,guestfwd=tcp:gIp:gPort-hIp:hPort']]
 
-,['net', ['myMacAddr', 'myCard', 'user', {guestIp:'gIp',hostToVmPortFwd:[{hostIp:'hIp',hostPort:'hPort', guestPort:'gPort'}],
-                                                        vmToHostPortFwd:[{hostIp:'hIp',hostPort:'hPort', guestPort:'gPort'}]}], ['-net', 'nic,model=myCard,macaddr=myMacAddr', '-net', 'user,dhcpstart=gIp,hostfwd=tcp:hIp:hPort-gIp:gPort,guestfwd=tcp:gIp:gPort-hIp:hPort']]
+,['net', ['myMacAddr', 'myCard', 'user', {ip:'gIp',hostToVmPortFwd:[{hostIp:'hIp',hostPort:'hPort', guestPort:'gPort'}],
+                                                   vmToHostPortFwd:[{hostIp:'hIp',hostPort:'hPort', guestPort:'gPort'}]}], ['-net', 'nic,model=myCard,macaddr=myMacAddr', '-net', 'user,dhcpstart=gIp,hostfwd=tcp:hIp:hPort-gIp:gPort,guestfwd=tcp:gIp:gPort-hIp:hPort']]
 
 
 // drives