mirror of
https://github.com/vagrant-libvirt/vagrant-libvirt.git
synced 2025-02-25 18:55:27 -06:00
Bugfix some stray machine args after tidy up (#1227)
Clean up the remaining references to the old functions after the wait-till-up networking code tidy up.
This commit is contained in:
@@ -21,7 +21,7 @@ module VagrantPlugins
|
|||||||
env[:metrics] ||= {}
|
env[:metrics] ||= {}
|
||||||
|
|
||||||
# Get domain object
|
# Get domain object
|
||||||
domain = env[:machine].provider.driver.get_domain(env[:machine].id.to_s)
|
domain = env[:machine].provider.driver.get_domain
|
||||||
if domain.nil?
|
if domain.nil?
|
||||||
raise Errors::NoDomainError,
|
raise Errors::NoDomainError,
|
||||||
error_message: "Domain #{env[:machine].id} not found"
|
error_message: "Domain #{env[:machine].id} not found"
|
||||||
|
|||||||
@@ -75,14 +75,14 @@ module VagrantPlugins
|
|||||||
domain
|
domain
|
||||||
end
|
end
|
||||||
|
|
||||||
def created?(mid)
|
def created?
|
||||||
domain = get_domain(mid)
|
domain = get_domain
|
||||||
!domain.nil?
|
!domain.nil?
|
||||||
end
|
end
|
||||||
|
|
||||||
def get_ipaddress
|
def get_ipaddress
|
||||||
# Find the machine
|
# Find the machine
|
||||||
domain = get_domain(@machine.id)
|
domain = get_domain
|
||||||
|
|
||||||
if domain.nil?
|
if domain.nil?
|
||||||
# The machine can't be found
|
# The machine can't be found
|
||||||
@@ -112,12 +112,12 @@ module VagrantPlugins
|
|||||||
ip_address
|
ip_address
|
||||||
end
|
end
|
||||||
|
|
||||||
def state(machine)
|
def state
|
||||||
# may be other error states with initial retreival we can't handle
|
# may be other error states with initial retreival we can't handle
|
||||||
begin
|
begin
|
||||||
domain = get_domain(machine.id)
|
domain = get_domain
|
||||||
rescue Libvirt::RetrieveError => e
|
rescue Libvirt::RetrieveError => e
|
||||||
@logger.debug("Machine #{machine.id} not found #{e}.")
|
@logger.debug("Machine #{@machine.id} not found #{e}.")
|
||||||
return :not_created
|
return :not_created
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -97,9 +97,9 @@ module VagrantPlugins
|
|||||||
state_id = nil
|
state_id = nil
|
||||||
state_id = :not_created unless @machine.id
|
state_id = :not_created unless @machine.id
|
||||||
state_id = :not_created if
|
state_id = :not_created if
|
||||||
!state_id && (!@machine.id || !driver.created?(@machine.id))
|
!state_id && (!@machine.id || !driver.created?)
|
||||||
# Query the driver for the current state of the machine
|
# Query the driver for the current state of the machine
|
||||||
state_id = driver.state(@machine) if @machine.id && !state_id
|
state_id = driver.state if @machine.id && !state_id
|
||||||
state_id = :unknown unless state_id
|
state_id = :unknown unless state_id
|
||||||
|
|
||||||
# This is a special pseudo-state so that we don't set the
|
# This is a special pseudo-state so that we don't set the
|
||||||
|
|||||||
Reference in New Issue
Block a user