Skip to content
This repository has been archived by the owner on Jul 16, 2023. It is now read-only.

Commit

Permalink
substitue calls to arg_parser namespace object
Browse files Browse the repository at this point in the history
  • Loading branch information
aibor committed Jul 5, 2015
1 parent 512a4a3 commit 1c36dbf
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions marmoset/pxe/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand All @@ -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:
Expand Down
18 changes: 9 additions & 9 deletions marmoset/virt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,29 @@

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)
)

network.add_host(
domain.interfaces[0].mac_address,
args['ip_address'],
args.ip_address,
name
)

Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 1c36dbf

Please sign in to comment.