|
 |
3012c9 |
From d0254345472c9415af1e06e9e8df2fe0ce464db0 Mon Sep 17 00:00:00 2001
|
|
|
3012c9 |
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
|
|
3012c9 |
Date: Mon, 2 May 2022 11:14:42 +0200
|
|
|
3012c9 |
Subject: [PATCH] fence_ibm_vpc: remove unused instance parameter and make
|
|
|
3012c9 |
limit optional
|
|
|
3012c9 |
|
|
|
3012c9 |
---
|
|
|
3012c9 |
agents/ibm_vpc/fence_ibm_vpc.py | 11 +----------
|
|
|
3012c9 |
tests/data/metadata/fence_ibm_vpc.xml | 7 +------
|
|
|
3012c9 |
2 files changed, 2 insertions(+), 16 deletions(-)
|
|
|
3012c9 |
|
|
|
3012c9 |
diff --git a/agents/ibm_vpc/fence_ibm_vpc.py b/agents/ibm_vpc/fence_ibm_vpc.py
|
|
|
3012c9 |
index 9f84f7b2d..9e38e8301 100755
|
|
|
3012c9 |
--- a/agents/ibm_vpc/fence_ibm_vpc.py
|
|
|
3012c9 |
+++ b/agents/ibm_vpc/fence_ibm_vpc.py
|
|
|
3012c9 |
@@ -161,14 +161,6 @@ def define_new_opts():
|
|
|
3012c9 |
"shortdesc" : "API Key",
|
|
|
3012c9 |
"order" : 0
|
|
|
3012c9 |
}
|
|
|
3012c9 |
- all_opt["instance"] = {
|
|
|
3012c9 |
- "getopt" : ":",
|
|
|
3012c9 |
- "longopt" : "instance",
|
|
|
3012c9 |
- "help" : "--instance=[instance] Cloud Instance",
|
|
|
3012c9 |
- "required" : "1",
|
|
|
3012c9 |
- "shortdesc" : "Cloud Instance",
|
|
|
3012c9 |
- "order" : 0
|
|
|
3012c9 |
- }
|
|
|
3012c9 |
all_opt["region"] = {
|
|
|
3012c9 |
"getopt" : ":",
|
|
|
3012c9 |
"longopt" : "region",
|
|
|
3012c9 |
@@ -181,7 +173,7 @@ def define_new_opts():
|
|
|
3012c9 |
"getopt" : ":",
|
|
|
3012c9 |
"longopt" : "limit",
|
|
|
3012c9 |
"help" : "--limit=[number] Limit number of nodes returned by API",
|
|
|
3012c9 |
- "required" : "1",
|
|
|
3012c9 |
+ "required" : "0",
|
|
|
3012c9 |
"default": 50,
|
|
|
3012c9 |
"shortdesc" : "Number of nodes returned by API",
|
|
|
3012c9 |
"order" : 0
|
|
|
3012c9 |
@@ -191,7 +183,6 @@ def define_new_opts():
|
|
|
3012c9 |
def main():
|
|
|
3012c9 |
device_opt = [
|
|
|
3012c9 |
"apikey",
|
|
|
3012c9 |
- "instance",
|
|
|
3012c9 |
"region",
|
|
|
3012c9 |
"limit",
|
|
|
3012c9 |
"port",
|
|
|
3012c9 |
diff --git a/tests/data/metadata/fence_ibm_vpc.xml b/tests/data/metadata/fence_ibm_vpc.xml
|
|
|
3012c9 |
index 926efcaa0..ee7151673 100644
|
|
|
3012c9 |
--- a/tests/data/metadata/fence_ibm_vpc.xml
|
|
|
3012c9 |
+++ b/tests/data/metadata/fence_ibm_vpc.xml
|
|
|
3012c9 |
@@ -8,12 +8,7 @@
|
|
|
3012c9 |
<content type="string" />
|
|
|
3012c9 |
<shortdesc lang="en">API Key</shortdesc>
|
|
|
3012c9 |
</parameter>
|
|
|
3012c9 |
- <parameter name="instance" unique="0" required="1">
|
|
|
3012c9 |
- <getopt mixed="--instance=[instance]" />
|
|
|
3012c9 |
- <content type="string" />
|
|
|
3012c9 |
- <shortdesc lang="en">Cloud Instance</shortdesc>
|
|
|
3012c9 |
- </parameter>
|
|
|
3012c9 |
- <parameter name="limit" unique="0" required="1">
|
|
|
3012c9 |
+ <parameter name="limit" unique="0" required="0">
|
|
|
3012c9 |
<getopt mixed="--limit=[number]" />
|
|
|
3012c9 |
<content type="string" default="50" />
|
|
|
3012c9 |
<shortdesc lang="en">Number of nodes returned by API</shortdesc>
|