Revision bc4662d8 kamaki/cli/commands/networking.py

b/kamaki/cli/commands/networking.py
60 60
    \n* to set authentication token: /config set cloud.<cloud>.token <token>'
61 61

  
62 62

  
63
#  Remove this when the endpoint issue is resolved
64
from kamaki.cli.commands.cyclades import _init_cyclades as _init_networking
65

  
66
# class _init_networking(_command_init):
67
#     @errors.generic.all
68
#     @addLogSettings
69
#     def _run(self, service='network'):
70
#         if getattr(self, 'cloud', None):
71
#             base_url = self._custom_url(service) or self._custom_url(
72
#                 'network')
73
#             if base_url:
74
#                 token = self._custom_token(service) or self._custom_token(
75
#                     'network') or self.config.get_cloud('token')
76
#                 self.client = NetworkingClient(
77
#                   base_url=base_url, token=token)
78
#                 return
79
#         else:
80
#             self.cloud = 'default'
81
#         if getattr(self, 'auth_base', False):
82
#             cyclades_endpoints = self.auth_base.get_service_endpoints(
83
#                 self._custom_type('network') or 'network',
84
#                 self._custom_version('network') or '')
85
#             base_url = cyclades_endpoints['publicURL']
86
#             token = self.auth_base.token
87
#             self.client = NetworkingClient(base_url=base_url, token=token)
88
#         else:
89
#             raise CLIBaseUrlError(service='network')
90

  
91
#     def main(self):
92
#         self._run()
63
class _init_networking(_command_init):
64
    @errors.generic.all
65
    @addLogSettings
66
    def _run(self, service='network'):
67
        if getattr(self, 'cloud', None):
68
            base_url = self._custom_url(service) or self._custom_url(
69
                'compute')
70
            if base_url:
71
                token = self._custom_token(service) or self._custom_token(
72
                    'compute') or self.config.get_cloud('token')
73
                self.client = NetworkingClient(
74
                  base_url=base_url, token=token)
75
                return
76
        else:
77
            self.cloud = 'default'
78
        if getattr(self, 'auth_base', False):
79
            cyclades_endpoints = self.auth_base.get_service_endpoints(
80
                self._custom_type('compute') or 'compute',
81
                self._custom_version('compute') or '')
82
            base_url = cyclades_endpoints['publicURL']
83
            token = self.auth_base.token
84
            self.client = NetworkingClient(base_url=base_url, token=token)
85
        else:
86
            raise CLIBaseUrlError(service='network')
87

  
88
    def main(self):
89
        self._run()
93 90

  
94 91

  
95 92
@command(network_cmds)
......
154 151
    @errors.cyclades.connection
155 152
    def _run(self, name):
156 153
        #  admin_state_up is not used in Cyclades
154
        print self.client.create_network
157 155
        net = self.client.create_network(
158 156
            name, admin_state_up=True, shared=self['shared'])
159 157
        self._print(net, self.print_dict)

Also available in: Unified diff