Revision 025fa6e2 kamaki/cli/commands/network.py
| b/kamaki/cli/commands/network.py | ||
|---|---|---|
| 189 | 189 |
name=ValueArgument('Network name', '--name'),
|
| 190 | 190 |
shared=FlagArgument( |
| 191 | 191 |
'Make network shared (special privileges required)', '--shared'), |
| 192 |
project=ValueArgument('Assign the network to project', '--project'),
|
|
| 192 |
project_id=ValueArgument('Assign network to project', '--project-id'),
|
|
| 193 | 193 |
network_type=NetworkTypeArgument( |
| 194 | 194 |
'Valid network types: %s' % (', '.join(NetworkTypeArgument.types)),
|
| 195 | 195 |
'--type') |
| ... | ... | |
| 200 | 200 |
@errors.cyclades.network_type |
| 201 | 201 |
def _run(self, network_type): |
| 202 | 202 |
net = self.client.create_network( |
| 203 |
network_type, name=self['name'], |
|
| 203 |
network_type, |
|
| 204 |
name=self['name'], |
|
| 204 | 205 |
shared=self['shared'], |
| 205 |
project=self['project']) |
|
| 206 |
project=self['project_id'])
|
|
| 206 | 207 |
self._print(net, self.print_dict) |
| 207 | 208 |
|
| 208 | 209 |
def main(self): |
| ... | ... | |
| 212 | 213 |
|
| 213 | 214 |
@command(network_cmds) |
| 214 | 215 |
class network_reassign(_init_network, _optional_json): |
| 215 |
"""Assign a network to a different project |
|
| 216 |
""" |
|
| 216 |
"""Assign a network to a different project""" |
|
| 217 |
|
|
| 218 |
arguments = dict( |
|
| 219 |
project_id=ValueArgument('Assign network to project', '--project-id'),
|
|
| 220 |
) |
|
| 221 |
required = ('project_id', )
|
|
| 217 | 222 |
|
| 218 | 223 |
@errors.generic.all |
| 219 | 224 |
@errors.cyclades.connection |
| ... | ... | |
| 221 | 226 |
def _run(self, network_id, project): |
| 222 | 227 |
self.client.reassign_network(network_id, project) |
| 223 | 228 |
|
| 224 |
def main(self, network_id, project):
|
|
| 229 |
def main(self, network_id): |
|
| 225 | 230 |
super(self.__class__, self)._run() |
| 226 |
self._run(network_id=network_id, project=project)
|
|
| 231 |
self._run(network_id=network_id, project=self['project'])
|
|
| 227 | 232 |
|
| 228 | 233 |
|
| 229 | 234 |
@command(network_cmds) |
| ... | ... | |
| 647 | 652 |
|
| 648 | 653 |
@command(ip_cmds) |
| 649 | 654 |
class ip_reassign(_init_network, _optional_output_cmd): |
| 650 |
"""Assign a floating IP to a different project |
|
| 651 |
""" |
|
| 655 |
"""Assign a floating IP to a different project""" |
|
| 656 |
|
|
| 657 |
arguments = dict( |
|
| 658 |
project_id=ValueArgument('Assign the IP to project', '--project-id'),
|
|
| 659 |
) |
|
| 660 |
required = ('project_id', )
|
|
| 661 |
|
|
| 652 | 662 |
@errors.generic.all |
| 653 | 663 |
@errors.cyclades.connection |
| 654 | 664 |
def _run(self, ip, project): |
| 655 | 665 |
self._optional_output(self.client.reassign_floating_ip(ip, project)) |
| 656 | 666 |
|
| 657 |
def main(self, IP, project):
|
|
| 667 |
def main(self, IP): |
|
| 658 | 668 |
super(self.__class__, self)._run() |
| 659 |
self._run(ip=IP, project=project)
|
|
| 669 |
self._run(ip=IP, project=self['project_id'])
|
|
| 660 | 670 |
|
| 661 | 671 |
|
| 662 | 672 |
@command(ip_cmds) |
Also available in: Unified diff