From e3270cdfd8fce895b8f32b8e23e48399be6ac85c Mon Sep 17 00:00:00 2001
From: Tang Chen <chen.tang@easystack.cn>
Date: Fri, 3 Jun 2016 12:21:45 +0800
Subject: Make set/unset commands in network return normally when nothing
 specified

set/unset commands should ends up normally instead of raising
an exception when nothing is specified to modify. The main
reason is: When nothing is specified, the command sets/unsets
nothing, which is a normal behavior, and ends up normally.
No API call fails. No error happens.

This patch also adds a releasenote for both network, and volume
commands that fix patch has been merged.

Change-Id: I78c348066078decd350417a431f3b8bea8fcf9ef
Partial-bug: #1588588
---
 openstackclient/network/v2/address_scope.py | 3 ---
 openstackclient/network/v2/network.py       | 5 -----
 openstackclient/network/v2/port.py          | 3 ---
 openstackclient/network/v2/router.py        | 5 -----
 openstackclient/network/v2/subnet.py        | 3 ---
 openstackclient/network/v2/subnet_pool.py   | 4 ----
 6 files changed, 23 deletions(-)

(limited to 'openstackclient/network')

diff --git a/openstackclient/network/v2/address_scope.py b/openstackclient/network/v2/address_scope.py
index dbc6865f..2e6cc30b 100644
--- a/openstackclient/network/v2/address_scope.py
+++ b/openstackclient/network/v2/address_scope.py
@@ -200,9 +200,6 @@ class SetAddressScope(command.Command):
             attrs['shared'] = True
         if parsed_args.no_share:
             attrs['shared'] = False
-        if attrs == {}:
-            msg = _("Nothing specified to be set.")
-            raise exceptions.CommandError(msg)
         client.update_address_scope(obj, **attrs)
 
 
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py
index bf01e2ec..87e65dad 100644
--- a/openstackclient/network/v2/network.py
+++ b/openstackclient/network/v2/network.py
@@ -14,7 +14,6 @@
 """Network action implementations"""
 
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
@@ -434,10 +433,6 @@ class SetNetwork(command.Command):
         obj = client.find_network(parsed_args.network, ignore_missing=False)
 
         attrs = _get_attrs(self.app.client_manager, parsed_args)
-        if attrs == {}:
-            msg = _("Nothing specified to be set")
-            raise exceptions.CommandError(msg)
-
         client.update_network(obj, **attrs)
 
 
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index 7ef3964b..b117897a 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -426,9 +426,6 @@ class SetPort(command.Command):
         elif parsed_args.no_fixed_ip:
             attrs['fixed_ips'] = []
 
-        if attrs == {}:
-            msg = _("Nothing specified to be set")
-            raise exceptions.CommandError(msg)
         client.update_port(obj, **attrs)
 
 
diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
index a2f0df1d..25487149 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -18,7 +18,6 @@ import json
 import logging
 
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import parseractions
 from openstackclient.common import utils
 from openstackclient.i18n import _
@@ -426,10 +425,6 @@ class SetRouter(command.Command):
                 route['nexthop'] = route.pop('gateway')
             attrs['routes'] = obj.routes + parsed_args.routes
 
-        if attrs == {}:
-            msg = _("Nothing specified to be set")
-            raise exceptions.CommandError(msg)
-
         client.update_router(obj, **attrs)
 
 
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index e7e1be99..8e378c7e 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -373,9 +373,6 @@ class SetSubnet(command.Command):
         obj = client.find_subnet(parsed_args.subnet, ignore_missing=False)
         attrs = _get_attrs(self.app.client_manager, parsed_args,
                            is_create=False)
-        if not attrs:
-            msg = "Nothing specified to be set"
-            raise exceptions.CommandError(msg)
         if 'dns_nameservers' in attrs:
             attrs['dns_nameservers'] += obj.dns_nameservers
         if 'host_routes' in attrs:
diff --git a/openstackclient/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py
index a1a94426..17f1e97d 100644
--- a/openstackclient/network/v2/subnet_pool.py
+++ b/openstackclient/network/v2/subnet_pool.py
@@ -14,7 +14,6 @@
 """Subnet pool action implementations"""
 
 from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.common import parseractions
 from openstackclient.common import utils
 from openstackclient.i18n import _
@@ -286,9 +285,6 @@ class SetSubnetPool(command.Command):
                                       ignore_missing=False)
 
         attrs = _get_attrs(self.app.client_manager, parsed_args)
-        if attrs == {}:
-            msg = _("Nothing specified to be set")
-            raise exceptions.CommandError(msg)
 
         # Existing prefixes must be a subset of the new prefixes.
         if 'prefixes' in attrs:
-- 
cgit v1.2.1