From 1eb2628dc4be239bf7d372c5993299b645237395 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Tue, 23 Aug 2016 20:32:29 +0200 Subject: [PATCH] Feature #4446: Show IPAM in onevnet --- src/cli/one_helper/onevnet_helper.rb | 1 + src/ipamm_mad/remotes/dummy/get_address | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb index ffdb2a62fc..3aae41382f 100644 --- a/src/cli/one_helper/onevnet_helper.rb +++ b/src/cli/one_helper/onevnet_helper.rb @@ -254,6 +254,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper puts str % ["SIZE", ar["SIZE"]] puts str % ["LEASES", ar["USED_LEASES"]] puts str % ["VN_MAD", ar["VN_MAD"]] if ar["VN_MAD"] + puts str % ["IPAM_MAD", ar["IPAM_MAD"]] if ar["IPAM_MAD"] puts format = "%-10s %34s %34s" diff --git a/src/ipamm_mad/remotes/dummy/get_address b/src/ipamm_mad/remotes/dummy/get_address index 3f5909b022..3696ebe466 100755 --- a/src/ipamm_mad/remotes/dummy/get_address +++ b/src/ipamm_mad/remotes/dummy/get_address @@ -105,7 +105,7 @@ HOST_ID=$RANDOM let "HOST_ID %= $AR_SIZE" cat << EOT -ADDRESS = [ IP=$BASE_IP.$HOST_ID, SIZE=$SIZE ] +ADDRESS = [ IP=$BASE_IP.$HOST_ID, SIZE=$ADDR_SIZE ] EOT exit 0