Revision 8be50626

b/docs/commands.rst
148 148
    firewall:  Manage server's firewall profile
149 149
        set :  Set the server's firewall profile
150 150
        get :  Get the server's firewall profile
151
    ip      :  Manage floating IPs for the servers
152
        attach:  Attach a floating ip to a server with server_id
153
        info  :  A floating IPs' details
154
        detach:  Detach floating ip from server
155
        list  :  List all floating ips
156
        create:  Create a new floating IP
157
        delete:  Delete a floating ip
158
        pools :  List all floating pools of floating ips
151 159
    info    :  Get server details
152 160
    list    :  List servers
153 161
    metadata:  Manage Server Metadata
b/docs/man/kamaki.rst
119 119
* firewall  Set the server (VM) firewall profile for public networks
120 120
    * set   Set the firewall profile
121 121
    * get   Get the firewall profile
122
* ip        Manage floating IPs for the servers
123
    * attach    Attach a floating ip to a server with server_id
124
    * info      A floating IPs' details
125
    * detach    Detach floating ip from server
126
    * list      List all floating ips
127
    * create    Create a new floating IP
128
    * delete    Delete a floating ip
129
    * pools     List all floating pools of floating ips
122 130
* info      Detailed information on a Virtual Machine
123 131
* list      List Virtual Machines accessible by user
124 132
* metadata  Manage a server metadata
b/docs/usage.rst
175 175
    create  :  Create a server (aka Virtual Machine)
176 176
    delete  :  Delete a server (VM)
177 177
    firewall:  Manage server (VM) firewall profiles for public networks
178
    ip      :  Manage floating IPs for the servers
178 179
    info    :  Detailed information on a Virtual Machine
179 180
    list    :  List Virtual Machines accessible by user
180 181
    metadata:  Manage Server metadata (key:value pairs of server attributes)
b/kamaki/cli/commands/cyclades.py
48 48
server_cmds = CommandTree('server', 'Cyclades/Compute API server commands')
49 49
flavor_cmds = CommandTree('flavor', 'Cyclades/Compute API flavor commands')
50 50
network_cmds = CommandTree('network', 'Cyclades/Compute API network commands')
51
floatingip_cmds = CommandTree(
52
    'floatingip', 'Cyclades/Compute API floating ip commands')
53
_commands = [server_cmds, flavor_cmds, network_cmds, floatingip_cmds]
51
_commands = [server_cmds, flavor_cmds, network_cmds]
54 52

  
55 53

  
56 54
about_authentication = '\nUser Authentication:\
......
861 859
        self._run(network_id=network_id, currect_status=currect_status)
862 860

  
863 861

  
864
@command(floatingip_cmds)
865
class floatingip_pools(_init_cyclades, _optional_json):
862
@command(server_cmds)
863
class server_ip(_init_cyclades):
864
    """Manage floating IPs for the servers"""
865

  
866

  
867
@command(server_cmds)
868
class server_ip_pools(_init_cyclades, _optional_json):
866 869
    """List all floating pools of floating ips"""
867 870

  
868 871
    @errors.generic.all
......
876 879
        self._run()
877 880

  
878 881

  
879
@command(floatingip_cmds)
880
class floatingip_list(_init_cyclades, _optional_json):
882
@command(server_cmds)
883
class server_ip_list(_init_cyclades, _optional_json):
881 884
    """List all floating ips"""
882 885

  
883 886
    @errors.generic.all
......
891 894
        self._run()
892 895

  
893 896

  
894
@command(floatingip_cmds)
895
class floatingip_info(_init_cyclades, _optional_json):
897
@command(server_cmds)
898
class server_ip_info(_init_cyclades, _optional_json):
896 899
    """A floating IPs' details"""
897 900

  
898 901
    @errors.generic.all
......
905 908
        self._run(ip=ip)
906 909

  
907 910

  
908
@command(floatingip_cmds)
909
class floatingip_create(_init_cyclades, _optional_json):
911
@command(server_cmds)
912
class server_ip_create(_init_cyclades, _optional_json):
910 913
    """Create a new floating IP"""
911 914

  
912 915
    arguments = dict(
......
924 927
        self._run(ip=requested_address)
925 928

  
926 929

  
927
@command(floatingip_cmds)
928
class floatingip_delete(_init_cyclades, _optional_output_cmd):
930
@command(server_cmds)
931
class server_ip_delete(_init_cyclades, _optional_output_cmd):
929 932
    """Delete a floating ip"""
930 933

  
931 934
    @errors.generic.all
......
956 959

  
957 960
@command(server_cmds)
958 961
class server_ip_detach(_init_cyclades):
959
    """detach_floating_ip_to_server
962
    """Detach floating IP from server
960 963
    """
961 964

  
962 965
    @errors.generic.all

Also available in: Unified diff