2 files changed, 38 insertions, 2 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 03419982..78c56788 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -1542,6 +1542,41 @@ class RemovePort(command.Command):
         server.interface_detach(port_id)
 
 
+class RemoveNetwork(command.Command):
+    _description = _("Remove all ports of a network from server")
+
+    def get_parser(self, prog_name):
+        parser = super(RemoveNetwork, self).get_parser(prog_name)
+        parser.add_argument(
+            "server",
+            metavar="<server>",
+            help=_("Server to remove the port from (name or ID)"),
+        )
+        parser.add_argument(
+            "network",
+            metavar="<network>",
+            help=_("Network to remove from the server (name or ID)"),
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        compute_client = self.app.client_manager.compute
+
+        server = utils.find_resource(
+            compute_client.servers, parsed_args.server)
+
+        if self.app.client_manager.is_network_endpoint_enabled():
+            network_client = self.app.client_manager.network
+            net_id = network_client.find_network(
+                parsed_args.network, ignore_missing=False).id
+        else:
+            net_id = parsed_args.network
+
+        for inf in server.interface_list():
+            if inf.net_id == net_id:
+                server.interface_detach(inf.port_id)
+
+
 class RemoveServerSecurityGroup(command.Command):
     _description = _("Remove security group from server")
 
diff --git a/openstackclient/compute/v2/server_group.py b/openstackclient/compute/v2/server_group.py
index c6e2161f..c49a552f 100644
--- a/openstackclient/compute/v2/server_group.py
+++ b/openstackclient/compute/v2/server_group.py
@@ -55,11 +55,12 @@ class CreateServerGroup(command.ShowOne):
         parser.add_argument(
             '--policy',
             metavar='<policy>',
-            choices=['affinity', 'anti-affinity'],
             default='affinity',
             help=_("Add a policy to <name> "
                    "('affinity' or 'anti-affinity', "
-                   "default to 'affinity')")
+                   "defaults to 'affinity'). Specify --os-compute-api-version "
+                   "2.15 or higher for the 'soft-affinity' or "
+                   "'soft-anti-affinity' policy.")
         )
         return parser