Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New submodule for state manipulation #379

Merged
merged 6 commits into from
Jul 25, 2023
Merged

New submodule for state manipulation #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c1755e
libnetplan: enable dump_yaml_subtree to use StringIO as input/output
daniloegea Jul 11, 2023
6fd7b1d
netplan:cli:state: new module to collect network configuration
daniloegea Jul 11, 2023
12bc8ae
commands:get/status: remove the code moved to state.py
daniloegea Jul 11, 2023
f7c13ef
tests: refactor some tests after the inclusion of state.py
daniloegea Jul 11, 2023
64145e0
status: add vlan to list of interface types
daniloegea Jul 13, 2023
338782b
netplan: export an IP addresses iterator API
daniloegea Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 3 additions & 39 deletions netplan/cli/commands/get.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,8 @@

'''netplan get command line'''

import sys
import io
import tempfile
import re

from netplan.cli.state import NetplanConfigState
import netplan.cli.utils as utils
import netplan.libnetplan as libnetplan


class NetplanGet(utils.NetplanCommand):
Expand All @@ -42,37 +37,6 @@ def run(self):
self.parse_args()
self.run_command()

def dump_state(self, key, np_state, output_file):
if key == 'all':
np_state.dump_yaml(output_file=output_file)
return

if not key.startswith('network'):
key = '.'.join(('network', key))
# Replace the '.' with '\t' but not at '\.' via negative lookbehind expression
key = re.sub(r'(?<!\\)\.', '\t', key).replace(r'\.', '.')

with tempfile.NamedTemporaryFile() as tmp_in:
np_state.dump_yaml(output_file=tmp_in)
libnetplan.dump_yaml_subtree(key, tmp_in, output_file=output_file)

def command_get(self):
parser = libnetplan.Parser()
parser.load_yaml_hierarchy(rootdir=self.root_dir)

np_state = libnetplan.State()
np_state.import_parser_results(parser)

try:
sys.stdout.fileno()
output_file = sys.stdout # pragma: nocover
except io.UnsupportedOperation: # Test environment detected, using a buffer file
slyon marked this conversation as resolved.
Show resolved Hide resolved
output_file = tempfile.TemporaryFile()

self.dump_state(self.key, np_state, output_file)

if output_file != sys.stdout:
output_file.flush()
output_file.seek(0)
sys.stdout.write(output_file.read().decode('utf-8'))
output_file.close()
state_data = NetplanConfigState(self.key, self.root_dir)
print(state_data, end='')
Loading