Skip to content

Commit a05e93a

Browse files
committed
update mcp functions
1 parent adfefd0 commit a05e93a

File tree

3 files changed

+1695
-281
lines changed

3 files changed

+1695
-281
lines changed

kvirt/cli.py

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from kvirt import examples
1616
from kvirt.nameutils import get_random_name
1717
from kvirt.baseconfig import Kbaseconfig
18-
from kvirt.common import error, pprint, success, warning, ssh, _ssh_credentials, container_mode
18+
from kvirt.common import error, pprint, success, warning, ssh, _ssh_credentials, container_mode, filter_info_plan
1919
from kvirt.common import get_git_version, compare_git_versions, interactive_kube, interactive_vm, convert_yaml_to_cmd
2020
from kvirt.config import Kconfig
2121
from kvirt.containerconfig import Kcontainerconfig
@@ -742,28 +742,6 @@ def _filter_list(_list, overrides={}):
742742
return new_list
743743

744744

745-
def _filter_info_plan(_list, overrides={}):
746-
new_list = []
747-
name = overrides.get('name')
748-
field = overrides.get('field')
749-
value = overrides.get('value')
750-
for entry in _list:
751-
new_entry = entry
752-
if field is not None:
753-
if field not in entry:
754-
continue
755-
if value is not None and entry[field] != value:
756-
continue
757-
if name is not None:
758-
if entry['name'] == name:
759-
return entry[field]
760-
else:
761-
continue
762-
new_entry = {entry['name']: entry[field]}
763-
new_list.append(new_entry)
764-
return new_list
765-
766-
767745
def _parse_vms_list(_list, overrides={}):
768746
if isinstance(_list, str):
769747
print(_list)
@@ -2228,7 +2206,7 @@ def info_plan(args):
22282206
namespace=args.namespace)
22292207
_list = config.info_specific_plan(args.plan, quiet=quiet)
22302208
if overrides:
2231-
_list = _filter_info_plan(_list, overrides)
2209+
_list = filter_info_plan(_list, overrides)
22322210
if output is not None:
22332211
_list_output(_list, output)
22342212
else:

kvirt/common/__init__.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2630,3 +2630,25 @@ def process_postscripts(clusterdir, postscripts):
26302630
script_path = os.path.expanduser(script) if script.startswith('/') else f'{currentdir}/{script}'
26312631
pprint(f"Running script {os.path.basename(script)}")
26322632
call(script_path, shell=True)
2633+
2634+
2635+
def filter_info_plan(_list, overrides={}):
2636+
new_list = []
2637+
name = overrides.get('name')
2638+
field = overrides.get('field')
2639+
value = overrides.get('value')
2640+
for entry in _list:
2641+
new_entry = entry
2642+
if field is not None:
2643+
if field not in entry:
2644+
continue
2645+
if value is not None and entry[field] != value:
2646+
continue
2647+
if name is not None:
2648+
if entry['name'] == name:
2649+
return entry[field]
2650+
else:
2651+
continue
2652+
new_entry = {entry['name']: entry[field]}
2653+
new_list.append(new_entry)
2654+
return new_list

0 commit comments

Comments
 (0)