From a343a6b4591919885f446788a9ec03998f7829b9 Mon Sep 17 00:00:00 2001 From: Daniel Tolan Date: Tue, 29 Sep 2020 15:48:10 +0000 Subject: [PATCH 1/3] Add --mem-allocated to vdc create --- vcd_cli/vdc.py | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/vcd_cli/vdc.py b/vcd_cli/vdc.py index 8a415314..48bb0f1f 100644 --- a/vcd_cli/vdc.py +++ b/vcd_cli/vdc.py @@ -53,7 +53,18 @@ def vdc(ctx): vcd vdc create dev-vdc -p prov-vdc -n net-pool -s '*' \\ -a ReservationPool -d 'vDC for development' Create new virtual datacenter. - +\b + vcd vdc create dev-vdc \\ + --provider-vdc prov-vdc \\ + --network-pool net-pool \\ + --network-quota 10240 \\ + --storage-profile '*' \\ + --storage-profile-limit 10240 \\ + --allocation-model AllocationPool \\ + --cpu-allocated 3000 \\ + --memory-allocated 2048 \\ + --description 'vDC for development' + Create new virtual datacenter. \b vcd vdc disable dev-vdc Disable virtual datacenter. @@ -234,7 +245,7 @@ def use(ctx, name): default=0, metavar='', type=click.INT, - help='Capacity that is commited to be available.') + help='Capacity (in hz) that is commited to be available.') @click.option( '--cpu-limit', required=False, @@ -242,6 +253,13 @@ def use(ctx, name): metavar='', type=click.INT, help='Capacity limit relative to the value specified for Allocation.') +@click.option( + '--mem-allocated', + required=False, + default=0, + metavar='', + type=click.INT, + help='Capacity (in MB) that is commited to be available.') @click.option( '--network-quota', required=False, @@ -249,8 +267,9 @@ def use(ctx, name): metavar='', type=click.INT, help='Maximum number of network objects that can be deployed in this vdc.') + def create(ctx, name, pvdc_name, network_pool_name, allocation_model, sp_name, - sp_limit, description, cpu_allocated, cpu_limit, network_quota): + sp_limit, description, cpu_allocated, cpu_limit, network_quota,mem_allocated): try: restore_session(ctx) client = ctx.obj['client'] @@ -273,6 +292,7 @@ def create(ctx, name, pvdc_name, network_pool_name, allocation_model, sp_name, cpu_limit=cpu_limit, storage_profiles=storage_profiles, network_quota=network_quota, + mem_allocated=mem_allocated, uses_fast_provisioning=True, is_thin_provision=True) stdout(vdc_resource.Tasks.Task[0], ctx) From ec1e34ed8422f62d3f9fe73ab2a45eb07ce12caa Mon Sep 17 00:00:00 2001 From: Daniel Tolan Date: Tue, 29 Sep 2020 15:48:10 +0000 Subject: [PATCH 2/3] Add --mem-allocated to vdc create Signed-off-by: Daniel Tolan --- vcd_cli/vdc.py | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/vcd_cli/vdc.py b/vcd_cli/vdc.py index 8a415314..48bb0f1f 100644 --- a/vcd_cli/vdc.py +++ b/vcd_cli/vdc.py @@ -53,7 +53,18 @@ def vdc(ctx): vcd vdc create dev-vdc -p prov-vdc -n net-pool -s '*' \\ -a ReservationPool -d 'vDC for development' Create new virtual datacenter. - +\b + vcd vdc create dev-vdc \\ + --provider-vdc prov-vdc \\ + --network-pool net-pool \\ + --network-quota 10240 \\ + --storage-profile '*' \\ + --storage-profile-limit 10240 \\ + --allocation-model AllocationPool \\ + --cpu-allocated 3000 \\ + --memory-allocated 2048 \\ + --description 'vDC for development' + Create new virtual datacenter. \b vcd vdc disable dev-vdc Disable virtual datacenter. @@ -234,7 +245,7 @@ def use(ctx, name): default=0, metavar='', type=click.INT, - help='Capacity that is commited to be available.') + help='Capacity (in hz) that is commited to be available.') @click.option( '--cpu-limit', required=False, @@ -242,6 +253,13 @@ def use(ctx, name): metavar='', type=click.INT, help='Capacity limit relative to the value specified for Allocation.') +@click.option( + '--mem-allocated', + required=False, + default=0, + metavar='', + type=click.INT, + help='Capacity (in MB) that is commited to be available.') @click.option( '--network-quota', required=False, @@ -249,8 +267,9 @@ def use(ctx, name): metavar='', type=click.INT, help='Maximum number of network objects that can be deployed in this vdc.') + def create(ctx, name, pvdc_name, network_pool_name, allocation_model, sp_name, - sp_limit, description, cpu_allocated, cpu_limit, network_quota): + sp_limit, description, cpu_allocated, cpu_limit, network_quota,mem_allocated): try: restore_session(ctx) client = ctx.obj['client'] @@ -273,6 +292,7 @@ def create(ctx, name, pvdc_name, network_pool_name, allocation_model, sp_name, cpu_limit=cpu_limit, storage_profiles=storage_profiles, network_quota=network_quota, + mem_allocated=mem_allocated, uses_fast_provisioning=True, is_thin_provision=True) stdout(vdc_resource.Tasks.Task[0], ctx) From 74cf7ce5bdabf4629ffbc8d8b9d14fd4dbbe0af3 Mon Sep 17 00:00:00 2001 From: Daniel Tolan Date: Tue, 29 Sep 2020 16:12:01 +0000 Subject: [PATCH 3/3] Updated to fix space issue --- vcd_cli/vdc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcd_cli/vdc.py b/vcd_cli/vdc.py index 48bb0f1f..269d90bf 100644 --- a/vcd_cli/vdc.py +++ b/vcd_cli/vdc.py @@ -269,7 +269,7 @@ def use(ctx, name): help='Maximum number of network objects that can be deployed in this vdc.') def create(ctx, name, pvdc_name, network_pool_name, allocation_model, sp_name, - sp_limit, description, cpu_allocated, cpu_limit, network_quota,mem_allocated): + sp_limit, description, cpu_allocated, cpu_limit, network_quota, mem_allocated): try: restore_session(ctx) client = ctx.obj['client']