diff --git a/marmoset/pxe/__init__.py b/marmoset/pxe/__init__.py index 6e4dd37..ef42e3a 100644 --- a/marmoset/pxe/__init__.py +++ b/marmoset/pxe/__init__.py @@ -3,8 +3,8 @@ def create(args): - pxe_client = ClientConfig(args['ip_address'], args['password']) - pxe_client.create(Label.find(args['label'])) + pxe_client = ClientConfig(args.ip_address, args.password) + pxe_client.create(Label.find(args.label)) msg = 'Created %s with password %s' print(msg % (pxe_client.file_path(), pxe_client.password)) @@ -15,7 +15,7 @@ def list(args): def remove(args): - pxe_client = ClientConfig(args['ip_address']) + pxe_client = ClientConfig(args.ip_address) if pxe_client.remove(): print('Removed', pxe_client.file_path()) else: diff --git a/marmoset/virt/__init__.py b/marmoset/virt/__init__.py index 9c142dd..62b0855 100644 --- a/marmoset/virt/__init__.py +++ b/marmoset/virt/__init__.py @@ -7,21 +7,21 @@ def create(args): network = Network.find_by('name', Network.DEFAULT) - if network.knows_ip_address(args['ip_address']): + if network.knows_ip_address(args.ip_address): raise Exception('IP address already assigned') - name = "{}_{}".format(args['user'], args['name']) + name = "{}_{}".format(args.user, args.name) storage = Storage.find_by('name', Storage.DEFAULT) - disk = storage.create_volume(name, args['disk']) - memory, unit = base.parse_unit(args['memory']) + disk = storage.create_volume(name, args.disk) + memory, unit = base.parse_unit(args.memory) domain = Domain.define( uuid = str(uuid.uuid4()), - name = args['name'], - user = args['user'], + name = args.name, + user = args.user, memory = memory, unit = unit, - vcpu = args['cpu'], + vcpu = args.cpu, disks = [dict(path = disk.path, bus = 'virtio', target = 'hda')], interfaces = [dict(model = 'virtio', network = Network.DEFAULT)], password = args.get('password', base.generate_password) @@ -29,7 +29,7 @@ def create(args): network.add_host( domain.interfaces[0].mac_address, - args['ip_address'], + args.ip_address, name ) @@ -60,7 +60,7 @@ def edit(domain, args): def remove(args): - domain = Domain.find_by('uuid', args['uuid']) + domain = Domain.find_by('uuid', args.uuid) try: domain.shutdown() except: pass for interface in domain.interfaces: