Merge ~freyes/ubuntu/+source/python-magnumclient:stable/ussuri into ~ubuntu-openstack-dev/ubuntu/+source/python-magnumclient:stable/ussuri

[Felipe Reyes]

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 17ed160..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,54 +0,0 @@
-*.py[cod]
-
-# C extensions
-*.so
-
-# Packages
-*.egg*
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-lib
-lib64
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-cover
-cover-master
-.stestr/
-.venv
-
-# Translations
-*.mo
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-.idea
-
-# Complexity
-output/*.html
-output/*/index.html
-
-# Sphinx
-doc/build
-
-# pbr generates these
-AUTHORS
-ChangeLog
-
-# Editors
-*~
-.*.swp
-*.DS_Store
diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index 2616d47..0000000
--- a/.gitreview
+++ /dev/null
@@ -1,4 +0,0 @@
-[gerrit]
-host=review.openstack.org
-port=29418
-project=openstack/python-magnumclient.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 241ca5d..c946e34 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,18 +1,15 @@
 - project:
     templates:
-      - openstack-python-jobs
-      - openstack-python35-jobs
-      - openstack-python36-jobs
       - check-requirements
+      - openstack-cover-jobs
+      - openstack-lower-constraints-jobs
+      - openstack-python3-ussuri-jobs
       - publish-openstack-docs-pti
     check:
       jobs:
-        - openstack-tox-lower-constraints
         - build-openstack-releasenotes
         - openstack-tox-cover:
             voting: false
-
     gate:
       jobs:
-        - openstack-tox-lower-constraints
         - build-openstack-releasenotes
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..add3f74
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,143 @@
+Aaron-DH <[e-mail]>
+Abhishek Chanda <[e-mail]>
+Abhishek Chanda <[e-mail]>
+Adrian Otto <[e-mail]>
+Akhila Kishore <[e-mail]>
+Amey Bhide <[e-mail]>
+Andreas Jaeger <[e-mail]>
+Andreas Jaeger <[e-mail]>
+Andrew Melton <[e-mail]>
+Anh Tran <[e-mail]>
+Bharat Kunwar <[e-mail]>
+Bharat Kunwar <[e-mail]>
+Bharath Thiruveedula <[e-mail]>
+Boris Pilka <[e-mail]>
+Cedric Brandily <[e-mail]>
+Christoph Jansen <[e-mail]>
+Clenimar Filemon <[e-mail]>
+Corey Bryant <[e-mail]>
+Corey O'Brien <[e-mail]>
+Costin Gamenț <[e-mail]>
+Dai Dang Van <[e-mail]>
+Dane LeBlanc <[e-mail]>
+Daneyon Hansen <[e-mail]>
+Daniel Abad <[e-mail]>
+Davanum Srinivas <[e-mail]>
+Davanum Srinivas <[e-mail]>
+David Liu <[e-mail]>
+David Rabel <[e-mail]>
+Doug Hellmann <[e-mail]>
+Eli Qiao <[e-mail]>
+Eric Brown <[e-mail]>
+Erik Olof Gunnar Andersson <[e-mail]>
+Fang Fenghua <[e-mail]>
+Fang fenghua <[e-mail]>
+Feilong Wang <[e-mail]>
+Feng Shengqin <[e-mail]>
+Flavio Percoco <[e-mail]>
+Ghanshyam Mann <[e-mail]>
+Haiwei Xu <[e-mail]>
+Hangdong Zhang <[e-mail]>
+Hieu LE <[e-mail]>
+Hongbin Lu <[e-mail]>
+Hongbin Lu <[e-mail]>
+Hongbn Lu <[e-mail]>
+Hua Wang <[e-mail]>
+Ian Cordasco <[e-mail]>
+Jake Yip <[e-mail]>
+James Page <[e-mail]>
+Janek Lehr <[e-mail]>
+Janonymous <[e-mail]>
+Jason Dunsmore <[e-mail]>
+Jay Lau (Guangya Liu) <[e-mail]>
+Jay Lau <[e-mail]>
+Jennifer Carlucci <[e-mail]>
+Jeremy Stanley <[e-mail]>
+Johannes Grassler <[e-mail]>
+Kennan <[e-mail]>
+Kennan <[e-mail]>
+Kiran_totad <[e-mail]>
+Lan Qi song <[e-mail]>
+Lin Yang <[e-mail]>
+Lucky samadhiya <[e-mail]>
+M V P Nitesh <[e-mail]>
+Madhuri <[e-mail]>
+Madhuri Kumari <[e-mail]>
+Madhuri Kumari <[e-mail]>
+Madhuri Kumari <[e-mail]>
+Manjeet Singh Bhatia <[e-mail]>
+Mark Goddard <[e-mail]>
+Michael Lekkas <[e-mail]>
+Michal Arbet <[e-mail]>
+Mike Fedosin <[e-mail]>
+Monty Taylor <[e-mail]>
+Motohiro OTSUKA <[e-mail]>
+Murali Allada <[e-mail]>
+Namrata <[e-mail]>
+Nguyen Hai <[e-mail]>
+Niall Bunting <[e-mail]>
+OTSUKA, Yuanying <[e-mail]>
+OTSUKA, Yuanying <[e-mail]>
+OpenStack Release Bot <[e-mail]>
+PanFengyun <[e-mail]>
+Pavlo Shchelokovskyy <[e-mail]>
+Rajiv Kumar <[e-mail]>
+Ricardo Rocha <[e-mail]>
+Sergey Vilgelm <[e-mail]>
+Spyros Trigazis <[e-mail]>
+Spyros Trigazis <[e-mail]>
+Stephen Watson <[e-mail]>
+Steven Dake <[e-mail]>
+Steven Dake <[e-mail]>
+Surojit Pathak <[e-mail]>
+Swapnil Kulkarni (coolsvap) <[e-mail]>
+Theodoros Tsioutsias <[e-mail]>
+Tom Cammann <[e-mail]>
+Tom Cammann <[e-mail]>
+Tovin Seven <[e-mail]>
+Vieri <[e-mail]>
+Vijendar Komalla <[e-mail]>
+Vikas Choudhary <[e-mail]>
+Vilobh Meshram <[e-mail]>
+Vipul Nayyar <[e-mail]>
+Vivek Jain <[e-mail]>
+Vu Cong Tuan <[e-mail]>
+Wanlong Gao <[e-mail]>
+Wenzhi Yu <[e-mail]>
+XiaojueGuan <[e-mail]>
+Yang Hongyang <[e-mail]>
+Yolanda Robla <[e-mail]>
+Zhenguo Niu <[e-mail]>
+chenaidong1 <[e-mail]>
+chenlx <[e-mail]>
+coldmoment <[e-mail]>
+coldmoment <[e-mail]>
+digambar <[e-mail]>
+digambar <[e-mail]>
+gecong1973 <[e-mail]>
+guo yunxian <[e-mail]>
+houming-wang <[e-mail]>
+jacky06 <[e-mail]>
+kavithahr <[e-mail]>
+maliki <[e-mail]>
+melissaml <[e-mail]>
+npraveen35 <[e-mail]>
+pawnesh.kumar <[e-mail]>
+phelanm <[e-mail]>
+qingszhao <[e-mail]>
+rajat29 <[e-mail]>
+ricolin <[e-mail]>
+ricolin <[e-mail]>
+shu-mutou <[e-mail]>
+space <[e-mail]>
+sunjia <[e-mail]>
+ting.wang <[e-mail]>
+venkatamahesh <[e-mail]>
+wangbo <[e-mail]>
+wangqun <[e-mail]>
+xiexs <[e-mail]>
+yanghuichan <[e-mail]>
+yatin <[e-mail]>
+yatin <[e-mail]>
+yatin karel <[e-mail]>
+yatinkarel <[e-mail]>
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index c82011a..771dc9f 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -13,4 +13,4 @@ Pull requests submitted through GitHub will be ignored.
 
 Bugs should be filed on Launchpad, not GitHub:
 
-   https://bugs.launchpad.net/python-magnumclient
\ No newline at end of file
+   https://bugs.launchpad.net/python-magnumclient
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..6646705
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,624 @@
+CHANGES
+=======
+
+3.0.1
+-----
+
+* Labels override
+* Rename variables to address pep8 error
+* Update TOX/UPPER\_CONSTRAINTS\_FILE for stable/ussuri
+* Update .gitreview for stable/ussuri
+
+3.0.0
+-----
+
+* Update master for stable/train
+* Update hacking for Python3
+* Drop py27 tests
+* Bugfix: Use fields option for cluster template list
+
+2.17.0
+------
+
+* Allow cluster config for any cluster state
+* Add nodegroup CRUD commands
+* Replace git.openstack.org URLs with opendev.org URLs
+
+2.15.0
+------
+
+* Support network, subnet and FIP when creating cluster
+
+2.14.0
+------
+
+* Add Python 3 Train unit tests
+* Conditional hidden arg for backward compatibility
+* Fix coverage test
+* Blacklist bandit 1.6.0 and cap Sphinx on Python2
+* Display project\_id for cluster show
+* OpenDev Migration Patch
+* Dropping the py35 testing
+
+2.13.0
+------
+
+* Add nodegroup list/show commands
+* Support upgrade API
+* Support resize api
+* Update master for stable/stein
+* Support health\_status on client side
+* python3 fixes
+
+2.12.0
+------
+
+* Keystone auth support
+* add python 3.7 unit test job
+* Add hidden property to cluster template
+* Fix py37 compatibility
+* Use oslo\_serialization instead of the json module directly
+* Use template for lower-constraints
+* Change openstack-dev to openstack-discuss
+* Add Python 3.6 classifier to setup.cfg
+* add python 3.6 unit test job
+* Trivial: Update pypi url to new url
+
+2.11.0
+------
+
+* Fix crash on Service catalog empty 403 response
+* add python 3.6 unit test job
+* switch documentation job to new PTI
+* import zuul job settings from project-config
+* Add release notes for magnum client
+* [k8s] Add embed certs to config
+
+2.10.0
+------
+
+* Switch to stestr
+* osc: Don't pass parameters with null value
+* Update links in README
+* fix tox python3 overrides
+* Fix entrypoints for quotas
+* Follow the new PTI for document build
+* add lower-constraints job
+* OSC command for magnum quota's
+* Add deprecation warnings to magnum client commands
+* Replace six.iteritems() with dict.items() in python-magnumclient
+* OSC command for ca-show, ca-sign, ca-roatate and stats-list
+* Now cluster-template-update works for "labels"
+* Make cluster-config rbac compatible for kubebernetes
+
+2.8.0
+-----
+
+* Add disable floating ip parameter
+* Updated from global requirements
+* Cleanup test-requirements
+* Updated from global requirements
+* Updated from global requirements
+* Set --labels default to None on cluster create
+* OSC: Add --flavor to coe cluster create
+* Add missing master\_flavor\_id in cluster attributes
+* Avoid tox\_install.sh for constraints support
+* Updated from global requirements
+* Replace six.iteritems() with .items()
+* OSC: Add --master-flavor to coe cluster create
+* Make cluster config --force a boolean
+* Updated from global requirements
+* Add --labels for cluster-create
+* OSC: Add --labels to coe cluster create
+* Add oslo.log as requirement
+* OSC: Add magnum service-list command
+* Now \`name\` is a positional argument in cluster creation
+* OSC: Remove unused files
+* inline comment typo fix
+
+2.7.0
+-----
+
+* Remove log translations
+* Updated from global requirements
+* OSC: Add cluster config command
+* OSC 4/4 Add remaining cluster commands
+* OSC 3/4 Add remaining CT commands
+* OSC 2/4 Add Cluster Create and List
+* Updated from global requirements
+* OSC 1/4 Add CT create and UT framework
+* Remove docker-volume-size from cluster-list
+* Updated from global requirements
+* Make cluster name positional in ca-show
+* remove slash from kubernetes cluster context name
+* Update the documentation link for doc migration
+* Updated from global requirements
+* Updated from global requirements
+* switch to openstackdocstheme
+* Don't set a default for docker\_volume\_size
+* Updated from global requirements
+* Make --profile load from environment variables
+* Add --docker-volume-size for cluster-create
+* Updated from global requirements
+* Change assertTrue(isinstance()) by optimal assert
+
+2.6.0
+-----
+
+* Add the support for 'detail' flag
+* Updated from global requirements
+* Replace assertRaisesRegexp with assertRaisesRegex
+* Updated from global requirements
+* Updated from global requirements
+* Magnum client suport insecure\_registry
+* Use assertIsNone(...) instead of assertEqual(None, ...)
+* Updated from global requirements
+* Updated from global requirements
+* Make --cluster option required for ca-rotate
+* Move cover.sh to the tools directory
+* Remove support for keyapir UUID
+* Fix wrong path reference
+* Update .gitignore to ignore .eggs
+* Increase Test coverage
+* The python 3.4 support is removed
+* Correct mistake from OSprofiler help
+* Fix UT for duplicate name args test case
+* Updated from global requirements
+* Add magnum client support for resource quotas
+* Update test requirement
+* Allow name as positional argument
+* Print exception details on update failure
+* Simplify magnumclient.shell.OpenStackMagnumShell.main()
+* Compare test coverage with the master branch
+* Updated from global requirements
+
+2.5.0
+-----
+
+* Add usage docs for magnum client
+* Updated from global requirements
+* Increase UT Coverage
+* Add the OSC 'cluster template list' command
+* Add osc-lib to requirements.txt
+* Add ca-rotate command to magnumclient
+
+2.4.0
+-----
+
+* Adding stats-list command to magnum client
+* Added link for modindex
+* Increase UT Coverage
+* Fix passing TLS\_VERIFIED in clusters/bays\_shell
+* Increase UT Coverage
+* Integrate OSprofiler in Magnum Client
+* Remove H903 error in sources
+* Updated from global requirements
+* Fix: swarm cluster-config, bay-config with tls\_disabled
+* Updated from global requirements
+* Pass 'api\_version' to create HTTPClient
+* Mark help messages for Translation
+* Allow cluster-config on cluster status 'ROLLBACK\_COMPLETE'
+* Add OSC command for cluster\_templates list
+* Rollback cluster/bay on update failure
+* Updated from global requirements
+* Magnum cluster-config/bay-config compatible with py3
+* Updated from global requirements
+* Show team and repo badges on README
+* Remove Not used Classes/Methods from apiclient.base
+* Use assert\_called\_\*/assert\_not\_called to verify mock calls
+* Fix: some typos in unit test
+* Use assert\_called\_\*/assert\_not\_called to verify mock calls
+* Renames \*-id parameters
+* Implement Parameter Deprecation
+* Use assert\_called\_\*/assert\_not\_called to verify mock calls
+* Add a deprecation message to the bay\* commands' help text
+* Updated from global requirements
+* Increase UT coverage
+* Remove invalid check for 'manifest' path
+* Updated from global requirements
+* Add .venv directory to .gitignore
+* Enable DeprecationWarning in test environments
+* Updated from global requirements
+* Add \_\_ne\_\_ built-in function
+* Add missing options for HTTPClient if auth\_token given
+* Updated from global requirements
+* Remove white space between print and ()
+* Add --keypair-id for cluster-create
+* Replace assertTrue(a in b) with assertIn(a, b)
+* Updated from global requirements
+* Fix the generated k8s config file
+* cluster-config return absolute path
+* delete python bytecode including pyo before every test run
+* Fix a keyward arguement error on bay-config
+* Add magnum.bash\_completion This can support the function of autocomplete for magnum's commands
+* Cluster creation command returns complete cluster uuid
+* Sync tools/tox\_install.sh
+
+2.3.0
+-----
+
+* Updated from global requirements
+* Magnum client to support sync and async bay opts
+* Add microversioning support for httpclient
+* Add floating\_ip\_enabled attributes to baymodel
+* Cleanup coverage configuration
+* Fixes bay\_uuid parameter issue in functional tests
+* Fix to use HttpClient if token is given
+* Updates certificate CLI to use cluster
+* Updated from global requirements
+* Adds 'cluster' and 'cluster template'
+* Append value using comma if key exists in label
+* bay-config return absolute path
+* Updated from global requirements
+* Use testr coverage feature
+* Use upper constraints for all jobs in tox.ini
+* Updated from global requirements
+* Enabled magnum client to display detailed information
+* Updated from global requirements
+* Add Python 3.5 classifier and venv
+* Base OSC plugin support
+* Use os-client-config in shell
+* Remove discover from test-requirements
+* Increase unit test coverage for module baymodels
+* Update the magnum client to send the latest version
+* Updated from global requirements
+* Add shell command bay-config
+* Display baymodel info with bay-show command
+
+2.2.0
+-----
+
+* Updated from global requirements
+* Bay\_create\_timeout should be set to 60 default
+* Prints  '-' instead of 'None' when data is None
+* Updated from global requirements
+* Pass a flag to disable LB in baymodels
+* Log appropriate error while exception
+* Add fixed\_subnet attributes to baymodel
+* Updated from global requirements
+* Support OS\_PROJECT\_\* env variables
+* Completely remove openstack common modules
+* Updated from global requirements
+* Add docker-storage-driver argument to baymodel
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Tox test should respect upper-constraints
+* Switch to a new service type "container-infra"
+* Add mesos\_slave\_executor\_environment\_variables validate in CLI
+* Add some fields back to bay\_list
+* Updated from global requirements
+* Add '--fields' to show more columns for bay-list
+* Update the home-page with developer documentation
+* Correcting help messages of baymodel
+* Add python3 to python classifiers
+* Add '--fields' to show more columns for baymodel-list
+* Corrected spacing mistake in baymodels\_shell.py
+* Updated from global requirements
+* Fix the bug when some value in labels has comma, it will fail
+* Remove k8s pods, rcs, svc and container API calls
+
+2.1.0
+-----
+
+* Updated from global requirements
+* Add endpoint\_override parameter to python-magnumclient
+* Updated from global requirements
+* Revert "Parameter format change for ca-show and ca-sign"
+* Updated from global requirements
+* Parameter format change for ca-show and ca-sign
+* Updated from global requirements
+* Fix the container-list with --limit 'a negative number'
+* Remove the update function of container
+* Add missing user message
+* Add marker/limit/sort-key/sort-dir features for bay-list
+* Add marker/limit/sort-key/sort-dir features for container-list
+* Allow semicolons in list of labels
+* Add unit tests for MServiceManager.list() method
+* Add unit tests for ContainerManager.list() method
+* Add unit tests for BayModelManager.list() method
+* Add unit tests for BayManager.list() method
+* Adapt http response error message parsing
+
+2.0.0
+-----
+
+* Fix incorrect initialization of OrderedDict
+* Remove bandit.yaml in favor of defaults
+* Revert "Completely remove openstack common modules"
+* Use six.u instead of u''
+* Completely remove openstack common modules
+* Add param for magnum baymodel-list
+* Move bandit into pep8
+* Client : Create BayModel with server type(VM/BM)
+* Updated from global requirements
+* Sync with oslo-incubator
+* Updated from global requirements
+* Remove node object from magnumclient
+* Exception not catched when bay create failed
+* Fix a spell typo
+* The rc-list should contain bay\_uuid
+* Remove unused attribute "ssh\_authorized\_key"
+* Update translation setup
+* Fix incorrect help message
+* Add Keystone v3 compatibility
+* Updated from global requirements
+* Adds Container Volume Model volume\_driver support
+* Python 3.4 compatibility
+* Add --insecure option
+* Fix endpoint\_types
+* Updated from global requirements
+* Replace six.iteritems(dict) with dict.items()
+* Change the endpoint env varible
+* Prevent list rcs when bay is not ready
+* raise exception when create rc with invalid bay status
+* raise exception when create container with invalid bay status
+* raise exception when create pod with invalid bay status
+* Revert "Pass environment variables of proxy to tox"
+* Add debug testenv in tox
+* Remove check for bay state on ca-sign and ca-show
+* Fix bypass\_url and errors with no headers
+* Remove unnecessary check when create bay
+* Fix test\_keys\_and\_vals\_to\_strs dict assert
+* Add unit test for pod-create with invalid bay status
+* Prevent list pods while bay is not ready
+* Updated from global requirements
+* Python 3 deprecated the logger.warn method in favor of warning
+* Remove references to \_i18n and apiclient.exceptions
+* Handle list object when print a dict
+* Put py34 first in the env order of tox
+* Updated from global requirements
+* Packages missing from requirements.txt
+* Add type validation and default for some parameter
+* Add py3 compatibility for unicode builtin
+* Add optional parameter --bay when doing container list
+* Updated from global requirements
+* Drop py33 support
+* use wild card for passing env variables
+* Add registry\_enabled option to baymodel-create
+* Improve client master\_count validation
+* Improve client node\_count validation
+* Fix default bay create timeout
+* Remove py26 support
+* Fix POD CLI to work with Object from Bay
+* Fix RC CLI to work with Object from Bay
+* Add .idea directory to .gitignore
+* Fix Service CLI to work with Object from Bay
+* Handle faultstring when using SessionClient
+* fix wrong function description
+* fix exceptions.from\_response() parameter
+* Fix the ouput of 'container-create' when it fails
+* Make bandit included in test-requirements.txt
+* Correct help message of '--name' for baymodel-create
+* Remove test\_shell\_args.py
+
+1.1.0
+-----
+
+* Revise help message of '--docker-volume-size' for baymodel-create
+* Updated from global requirements
+* Improve readme contents
+* Split v1 shell sub-command into specific files
+* Updated from global requirements
+* Fix RC CLI to work with Object from Bay changes
+* Update baymodel-update help doc
+* Delete python bytecode before every test run
+* Add .DS\_Store to .gitignore
+* Updated from global requirements
+* Use keystoneauth to create a Session
+* Make image as required for do\_container\_create
+* Add test for container\_create
+* Add unversioned client constructor
+* Fix rc cli to work with bay identifier
+* Updated from global requirements
+* Updated from global requirements
+* Add the introduce of the command "magnum help ca-show"
+* Add the introduce of the command "magnum help ca-sign"
+
+1.0.0.0b1
+---------
+
+* Updated from global requirements
+* Pass bay\_ident to k8s objects methods
+* Add an option to specify container memory size
+* Add support for 'baymodel-update' in python-client
+* Support for public baymodels
+* Rename 'insecure' baymodel attribute to 'tls\_disabled'
+* Client: Pass bay\_uuid to Service Read/Write API
+* Client: Pass bay\_uuid to Pod Read/Write API
+* Client: Pass bay\_uuid to RC Read/Write API
+* Add insecure flag to baymodel
+* Magnum show cmds display dictionaries with unicode u chars
+* Adding 'magnum service-list'
+* Add certificates operations
+* Change ignore-errors to ignore\_errors
+* Add support for python >= 3.4
+* Updated from global requirements
+* Adds Labels Support
+* Adds Container Network Model network\_driver support
+* Update help message for coe service related command
+* Add missed space between two words
+* Updated from global requirements
+* Rename existing service-\* to coe-service-\*
+* Updated from global requirements
+* Remove name from test token
+* This adds proxy feature in magnum client
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Add support for multiple master nodes
+* Updated from global requirements
+* Remove uuidutils from openstack.common
+* Updated from global requirements
+* Updated from global requirements
+* Remove H803 rule
+* Updated from global requirements
+* Updated from global requirements
+* Updated from global requirements
+* Rename image\_id to image when create a container
+* Updated from global requirements
+* Add missing dependency oslo.serialization
+* Updated from global requirements
+* Add additional arguments to CLI for container-create
+* Pass environment variables of proxy to tox
+* Change container-execute to container-exec
+* Updated from global requirements
+* Sync from latest oslo-incubator
+* Updated from global requirements
+* Fix translation setup
+
+0.2.1
+-----
+
+* Make metavar's consistent
+* Setup for translation
+* Updated from global requirements
+* Bump up to newer hacking
+* Add support of container resource management with "name"
+* Add support for container status
+* Drop use of 'oslo' namespace package
+
+0.2.0
+-----
+
+* Remove links attribute from pod show
+* Log the correct url in debug mode
+* Add heat timeout to bay-create for magnum client
+* Add coe attribute to BayModel creation
+* Add bay\_uuid to container create
+* Update README to work with release tools
+* Add support for pod name in pod-update command
+
+0.1.0
+-----
+
+* Add bay status check when rc create
+* Add bay status check when service create
+* fix a typo in log
+* Add bay status check when pod create
+* Rename swarm-token to discovery-url
+* Support pass command field when create a container
+* Delegate magnum url search to url\_for method
+* Remove side effect in get\_keystoneclient
+* Add unittests for magnumclient.v1.client module
+* Correct mock use in TestCommandLineArgument.setUp
+* Uncap library requirements for liberty
+* Support update a replication controller
+* Support update a service
+* Add swarm\_token to bay-create call
+* Support update a pod
+* Authenticate once
+* Add error info detail for magnum cli
+* Update bandit for latest usage
+* Add tox bandit support for python-magnumclient
+* Remove unused get\_projects\_list method
+* Add support for bay name in bay-update command
+* Allow bay name when replication controller is created
+* Update .gitreview for project rename
+* Allow baymodel name when bay is created
+* Allow bay name when pod is created
+* Allow bay name when service is created
+* Support keystone region
+* Rename k8s specific bay attributes
+* Add support of baymodel resource management with "name"
+* Add support of rc resource management with "name"
+* Add support of service resource management with "name"
+* Allow specification of ssh\_authorized\_key
+
+0.0.1
+-----
+
+* Add support of pod resource management with "name"
+* Remove some default values for baymodel create
+* Add support of bay resource management with "name"
+* Fix container exec output
+* Fix the container logs output
+* Make baymodel-create fail when no argument passed
+* Display bay status column
+* tidy up language on one shell help command
+* Allow adding master flavor id to baymodel
+* Allow specification of fixed\_network
+* Allow specification of docker\_volume\_size
+* Support multiple args in some magnum commands
+* Remove '--id' option from magnum commands
+* Make bay-create fail when no argument passed
+* Adding test for magnumclient argument parsing
+* Add support for updating a bay
+* Adding tests for v1/shell.py
+* Adding test for shell.py
+* Container logs should use HTTP GET
+* Add help info for container operations
+* Update help message for baymodel operations
+* Add help for magnum object show
+* Remove 'desc' from container output
+* Rename \`resource\`\_data/url attributes to manifest/manifest\_url
+* Default version should be v1 in magnum
+* Fix an error on not finding log handler
+* Add id as required for bay-show/delete
+* Revert "Fix an error on not finding log handler"
+* Change rc\_data to replicationcontroller\_data
+* Fix an error on not finding log handler
+* Make replication controller client works
+* Remove 'desc' from docker creation attribute
+* Update test\_update to test\_pod\_update for pod client test
+* Add client test for k8s replication controller
+* Add client test for k8s service
+* Add client test for magnum containers
+* Add client test for magnum baymodel
+* Add client test for magnum bay
+* Add client test for magnum node
+* Support file path as a service manifest data
+* Adjusted CLI argument names to use dashes rather than underscores
+* Add client test for test\_pods
+* Support file path as a pod data
+* Add unit test for magnumclient/common/httpclient.py
+* Add unit test for magnumclient/common/utils.py
+* Update K8S Pod and Service input parameter
+* Make id as required when delete or show object info
+* Construct URI properly for container-execute
+* Add k8s replication support for magnum client
+* Ensure a id string is passed when --id is used
+* Change folder of api to v1 for magumclient
+* Get container-list CLI working
+* Do not advertise py33 compatibility
+* Set HTTP PUT Content-Length for container actions
+* Implement container actions
+* Add image\_id attribute for container
+* Service create only need service filename
+* pod create only need pod filename
+* Implement client for service operations
+* Update parmater name for \_show\_pod
+* Add baymodel\_id to bay\_create
+* Add flavor\_id property to baymodel object
+* Implement pod client CLI
+* Make bay-create operate again as a result of baymodel
+* Make bay create work with new bay model structure
+* Type and image\_id are removed from server
+* Don't show links when showing bay
+* Make baymodel-list only show name and UUID
+* Make baymodel not show links
+* Implement baymodel in client
+* Add node object to the python client
+* Add image\_id and node\_count to bay-create
+* Workflow documentation is now in infra-manual
+* Make separate Bay objects for each bay object
+* Complete implementation of bay operations
+* Docstring cleanups
+* Delete bay rather then container when requested
+* Misc cleanups
+* Make container in sync with bays and pods
+* Make pod objects work in ReST Client API
+* Make bay objects work in ReST Client API
+* Modify container list attributes
+* Implements basic container operations
+* Add client resources and managers
+* Update apiclient from oslo-incubator
+* Add apiclient library from oslo-incubator
+* Added default service type
+* Skeleton for the cli client
+* Include the auth module from oslo
+* Sync common code from oslo-incubator
+* Added project required files
+* Add service API methods to what should be implemented
+* Boilerplate client for communicating with ReST API
+* Initial commit
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..8045ab2
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,61 @@
+Metadata-Version: 1.1
+Name: python-magnumclient
+Version: 3.0.1
+Summary: Client library for Magnum API
+Home-page: https://docs.openstack.org/python-magnumclient/latest/
+Author: OpenStack
+Author-email: [e-mail]
+License: UNKNOWN
+Description: ========================
+        Team and repository tags
+        ========================
+        
+        .. image:: https://governance.openstack.org/tc/badges/python-magnumclient.svg
+            :target: https://governance.openstack.org/tc/reference/tags/index.html
+        
+        .. Change things from this point on
+        
+        Python bindings to the Magnum API
+        =================================
+        
+        .. image:: https://img.shields.io/pypi/v/python-magnumclient.svg
+            :target: https://pypi.org/project/python-magnumclient/
+            :alt: Latest Version
+        
+        .. image:: https://img.shields.io/pypi/dm/python-magnumclient.svg
+            :target: https://pypi.org/project/python-magnumclient/
+            :alt: Downloads
+        
+        This is a client library for Magnum built on the Magnum API. It
+        provides a Python API (the ``magnumclient`` module) and a command-line
+        tool (``magnum``).
+        
+        Development takes place via the usual OpenStack processes as outlined
+        in the `developer guide
+        <https://docs.openstack.org/infra/manual/developers.html>`_.
+        
+        * License: Apache License, Version 2.0
+        * `PyPi`_ - package installation
+        * `Online Documentation`_
+        * `Launchpad project`_ - release management
+        * `Bugs`_ - issue tracking
+        * `Source`_
+        
+        .. _PyPi: https://pypi.org/project/python-magnumclient
+        .. _Online Documentation: https://docs.openstack.org/python-magnumclient/latest/
+        .. _Launchpad project: https://launchpad.net/python-magnumclient
+        .. _Bugs: https://bugs.launchpad.net/python-magnumclient
+        .. _Source: https://opendev.org/openstack/python-magnumclient
+        
+        
+Platform: UNKNOWN
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
diff --git a/README.rst b/README.rst
index 2b7cf2b..c39cfb8 100644
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,8 @@
 Team and repository tags
 ========================
 
-.. image:: http://governance.openstack.org/badges/python-magnumclient.svg
-    :target: http://governance.openstack.org/reference/tags/index.html
+.. image:: https://governance.openstack.org/tc/badges/python-magnumclient.svg
+    :target: https://governance.openstack.org/tc/reference/tags/index.html
 
 .. Change things from this point on
 
@@ -11,11 +11,11 @@ Python bindings to the Magnum API
 =================================
 
 .. image:: https://img.shields.io/pypi/v/python-magnumclient.svg
-    :target: https://pypi.python.org/pypi/python-magnumclient/
+    :target: https://pypi.org/project/python-magnumclient/
     :alt: Latest Version
 
 .. image:: https://img.shields.io/pypi/dm/python-magnumclient.svg
-    :target: https://pypi.python.org/pypi/python-magnumclient/
+    :target: https://pypi.org/project/python-magnumclient/
     :alt: Downloads
 
 This is a client library for Magnum built on the Magnum API. It
@@ -33,8 +33,8 @@ in the `developer guide
 * `Bugs`_ - issue tracking
 * `Source`_
 
-.. _PyPi: https://pypi.python.org/pypi/python-magnumclient
+.. _PyPi: https://pypi.org/project/python-magnumclient
 .. _Online Documentation: https://docs.openstack.org/python-magnumclient/latest/
 .. _Launchpad project: https://launchpad.net/python-magnumclient
 .. _Bugs: https://bugs.launchpad.net/python-magnumclient
-.. _Source: https://git.openstack.org/cgit/openstack/python-magnumclient
+.. _Source: https://opendev.org/openstack/python-magnumclient
diff --git a/debian/changelog b/debian/changelog
index 67e2c7c..7860985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+python-magnumclient (3.0.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * d/watch: Scope to 3.x series.
+  * New stable point release for OpenStack Ussuri (LP: #1996229).
+  * d/p/fix-py37-compatibility.patch: Dropped. Fixed in new stable point
+    release.
+  * d/p/Fix-failing-to-parse-json-error-msg.patch: Dropped. Fixed in new
+    stable point release.
+
+ -- Felipe Reyes <[e-mail]>  Fri, 12 May 2023 12:18:49 -0400
+
 python-magnumclient (2.11.0-0ubuntu6) focal; urgency=medium
 
   * d/p/Fix-failing-to-parse-json-error-msg.patch: Fix failing to parse json
diff --git a/debian/patches/Fix-failing-to-parse-json-error-msg.patch b/debian/patches/Fix-failing-to-parse-json-error-msg.patch
deleted file mode 100644
index 3bb25d8..0000000
--- a/debian/patches/Fix-failing-to-parse-json-error-msg.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f7551a6bac103070ff456098fe2631409620d492 Mon Sep 17 00:00:00 2001
-From: Tobias Urdin <[e-mail]>
-Date: Wed, 18 Nov 2020 11:46:44 +0100
-Subject: [PATCH] Fix failing to parse json error msg
-
-It assumes its a requests response but could
-be a HTTPResponse from urllib.
-
-Story: 2008789
-Task: 42183
-
-Change-Id: I7306d167a17284c7f478ec1c1599a8d4b32040c2
----
- magnumclient/common/httpclient.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-Index: python-magnumclient-2.11.0/magnumclient/common/httpclient.py
-===================================================================
---- python-magnumclient-2.11.0.orig/magnumclient/common/httpclient.py
-+++ python-magnumclient-2.11.0/magnumclient/common/httpclient.py
-@@ -23,6 +23,7 @@ import socket
- import ssl
- 
- from keystoneauth1 import adapter
-+from oslo_serialization import jsonutils
- from oslo_utils import importutils
- import six
- import six.moves.urllib.parse as urlparse
-@@ -65,6 +66,9 @@ def _extract_error_json(body, resp):
-         try:
-             body_json = resp.json()
-             return _extract_error_json_text(body_json)
-+        except AttributeError:
-+            body_json = jsonutils.loads(body)
-+            return _extract_error_json_text(body_json)
-         except ValueError:
-             return {}
-     else:
diff --git a/debian/patches/fix-py37-compatibility.patch b/debian/patches/fix-py37-compatibility.patch
deleted file mode 100644
index 29e3459..0000000
--- a/debian/patches/fix-py37-compatibility.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5deb538930d98bf83e11bfb1dacb509982226540 Mon Sep 17 00:00:00 2001
-From: Michal Arbet <[e-mail]>
-Date: Wed, 6 Feb 2019 14:11:07 +0100
-Subject: [PATCH] Fix py37 compatibility
-
-Unit tests are failing under python3.7.
-Generators which explicitly raise StopIteration can generally be
-changed to simply return instead. This will be compatible with
-all existing Python versions.
-
-PEP Documentation for this change:
-https://www.python.org/dev/peps/pep-0479/
-
-Change-Id: I4ae2049d8a2469d0a37077bdc722481e68d7cc49
-Closes-Bug: #1814890
----
- magnumclient/common/httpclient.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/magnumclient/common/httpclient.py b/magnumclient/common/httpclient.py
-index ce9e4c9..038fb21 100644
---- a/magnumclient/common/httpclient.py
-+++ b/magnumclient/common/httpclient.py
-@@ -406,7 +406,10 @@ class ResponseBodyIterator(object):
- 
-     def __iter__(self):
-         while True:
--            yield self.next()
-+            try:
-+                yield self.next()
-+            except StopIteration:
-+                return
- 
-     def __bool__(self):
-         return hasattr(self, 'items')
-@@ -418,7 +421,7 @@ class ResponseBodyIterator(object):
-         if chunk:
-             return chunk
-         else:
--            raise StopIteration()
-+            raise StopIteration
- 
- 
- def _construct_http_client(*args, **kwargs):
--- 
-2.31.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 5b19bc2..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-fix-py37-compatibility.patch
-Fix-failing-to-parse-json-error-msg.patch
diff --git a/debian/watch b/debian/watch
index e38e2ce..b2923cb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/\.(b|rc)/~$1/" \
-https://github.com/openstack/python-magnumclient/tags .*/(\d[\d\.]+)\.tar\.gz
+opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/;s/\.0b/~b/;s/\.0rc/~rc/" \
+https://tarballs.opendev.org/openstack/python-magnumclient/ python-magnumclient-(3\.\d.*)\.tar\.gz
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 0dff061..711fb97 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,3 +1,4 @@
-sphinx!=1.6.6,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
diff --git a/magnumclient/common/cliutils.py b/magnumclient/common/cliutils.py
index 34ab129..7061f3b 100644
--- a/magnumclient/common/cliutils.py
+++ b/magnumclient/common/cliutils.py
@@ -404,8 +404,8 @@ def get_service_type(f):
     return getattr(f, 'service_type', None)
 
 
-def pretty_choice_list(l):
-    return ', '.join("'%s'" % i for i in l)
+def pretty_choice_list(lst):
+    return ', '.join("'%s'" % i for i in lst)
 
 
 def exit(msg=''):
diff --git a/magnumclient/common/httpclient.py b/magnumclient/common/httpclient.py
index 8e5d90f..038fb21 100644
--- a/magnumclient/common/httpclient.py
+++ b/magnumclient/common/httpclient.py
@@ -16,13 +16,13 @@
 #    under the License.
 
 import copy
-import json
 import logging
 import os
 import socket
 import ssl
 
 from keystoneauth1 import adapter
+from oslo_serialization import jsonutils
 from oslo_utils import importutils
 import six
 import six.moves.urllib.parse as urlparse
@@ -43,7 +43,7 @@ def _extract_error_json_text(body_json):
     error_json = {}
     if 'error_message' in body_json:
         raw_msg = body_json['error_message']
-        error_json = json.loads(raw_msg)
+        error_json = jsonutils.loads(raw_msg)
     elif 'error' in body_json:
         error_body = body_json['error']
         error_json = {'faultstring': error_body['title'],
@@ -69,7 +69,7 @@ def _extract_error_json(body, resp):
             return {}
     else:
         try:
-            body_json = json.loads(body)
+            body_json = jsonutils.loads(body)
             return _extract_error_json_text(body_json)
         except ValueError:
             return {}
@@ -228,7 +228,7 @@ class HTTPClient(object):
         kwargs['headers'].setdefault('Accept', 'application/json')
 
         if 'body' in kwargs:
-            kwargs['body'] = json.dumps(kwargs['body'])
+            kwargs['body'] = jsonutils.dumps(kwargs['body'])
 
         resp, body_iter = self._http_request(url, method, **kwargs)
         content_type = resp.getheader('content-type', None)
@@ -239,7 +239,7 @@ class HTTPClient(object):
         if 'application/json' in content_type:
             body = ''.join([chunk for chunk in body_iter])
             try:
-                body = json.loads(body)
+                body = jsonutils.loads(body)
             except ValueError:
                 LOG.error('Could not decode response body as JSON')
         else:
@@ -373,7 +373,7 @@ class SessionClient(adapter.LegacyJsonAdapter):
         kwargs['headers'].setdefault('Content-Type', 'application/json')
         kwargs['headers'].setdefault('Accept', 'application/json')
         if 'body' in kwargs:
-            kwargs['data'] = json.dumps(kwargs.pop('body'))
+            kwargs['data'] = jsonutils.dumps(kwargs.pop('body'))
 
         resp = self._http_request(url, method, **kwargs)
         body = resp.content
@@ -406,7 +406,10 @@ class ResponseBodyIterator(object):
 
     def __iter__(self):
         while True:
-            yield self.next()
+            try:
+                yield self.next()
+            except StopIteration:
+                return
 
     def __bool__(self):
         return hasattr(self, 'items')
@@ -418,7 +421,7 @@ class ResponseBodyIterator(object):
         if chunk:
             return chunk
         else:
-            raise StopIteration()
+            raise StopIteration
 
 
 def _construct_http_client(*args, **kwargs):
diff --git a/magnumclient/common/utils.py b/magnumclient/common/utils.py
index 99676da..4a8cfb1 100644
--- a/magnumclient/common/utils.py
+++ b/magnumclient/common/utils.py
@@ -15,8 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import base64
-import json
 import os
 
 from cryptography.hazmat.backends import default_backend
@@ -25,6 +23,8 @@ from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives import serialization
 from cryptography import x509
 from cryptography.x509.oid import NameOID
+from oslo_serialization import base64
+from oslo_serialization import jsonutils
 
 from magnumclient import exceptions as exc
 from magnumclient.i18n import _
@@ -64,7 +64,7 @@ def split_and_deserialize(string):
         raise exc.CommandError(_('Attributes must be a list of '
                                  'PATH=VALUE not "%s"') % string)
     try:
-        value = json.loads(value)
+        value = jsonutils.loads(value)
     except ValueError:
         pass
 
@@ -100,7 +100,7 @@ def handle_labels(labels):
     if 'mesos_slave_executor_env_file' in labels:
         environment_variables_data = handle_json_from_file(
             labels['mesos_slave_executor_env_file'])
-        labels['mesos_slave_executor_env_variables'] = json.dumps(
+        labels['mesos_slave_executor_env_variables'] = jsonutils.dumps(
             environment_variables_data)
     return labels
 
@@ -118,12 +118,12 @@ def format_labels(lbls, parse_comma=True):
             lbls = lbls[0].replace(';', ',').split(',')
 
     labels = {}
-    for l in lbls:
+    for lbl in lbls:
         try:
-            (k, v) = l.split(('='), 1)
+            (k, v) = lbl.split(('='), 1)
         except ValueError:
             raise exc.CommandError(_('labels must be a list of KEY=VALUE '
-                                     'not %s') % l)
+                                     'not %s') % lbl)
         if k not in labels:
             labels[k] = v
         else:
@@ -146,7 +146,7 @@ def handle_json_from_file(json_arg):
     try:
         with open(json_arg, 'r') as f:
             json_arg = f.read().strip()
-            json_arg = json.loads(json_arg)
+            json_arg = jsonutils.loads(json_arg)
     except IOError as e:
         err = _("Cannot get JSON from file '%(file)s'. "
                 "Error: %(err)s") % {'err': e, 'file': json_arg}
@@ -160,11 +160,11 @@ def handle_json_from_file(json_arg):
 
 
 def config_cluster(cluster, cluster_template, cfg_dir, force=False,
-                   certs=None):
+                   certs=None, use_keystone=False):
     """Return and write configuration for the given cluster."""
     if cluster_template.coe == 'kubernetes':
         return _config_cluster_kubernetes(cluster, cluster_template, cfg_dir,
-                                          force, certs)
+                                          force, certs, use_keystone)
     elif (cluster_template.coe == 'swarm'
           or cluster_template.coe == 'swarm-mode'):
         return _config_cluster_swarm(cluster, cluster_template, cfg_dir,
@@ -172,7 +172,7 @@ def config_cluster(cluster, cluster_template, cfg_dir, force=False,
 
 
 def _config_cluster_kubernetes(cluster, cluster_template, cfg_dir,
-                               force=False, certs=None):
+                               force=False, certs=None, use_keystone=False):
     """Return and write configuration for the given kubernetes cluster."""
     cfg_file = "%s/config" % cfg_dir
     if cluster_template.tls_disabled or certs is None:
@@ -193,30 +193,64 @@ def _config_cluster_kubernetes(cluster, cluster_template, cfg_dir,
                "- name: %(name)s'\n"
                % {'name': cluster.name, 'api_address': cluster.api_address})
     else:
-        cfg = ("apiVersion: v1\n"
-               "clusters:\n"
-               "- cluster:\n"
-               "    certificate-authority-data: %(ca)s\n"
-               "    server: %(api_address)s\n"
-               "  name: %(name)s\n"
-               "contexts:\n"
-               "- context:\n"
-               "    cluster: %(name)s\n"
-               "    user: admin\n"
-               "  name: default\n"
-               "current-context: default\n"
-               "kind: Config\n"
-               "preferences: {}\n"
-               "users:\n"
-               "- name: admin\n"
-               "  user:\n"
-               "    client-certificate-data: %(cert)s\n"
-               "    client-key-data: %(key)s\n"
-               % {'name': cluster.name,
-                  'api_address': cluster.api_address,
-                  'key': base64.b64encode(certs['key']),
-                  'cert': base64.b64encode(certs['cert']),
-                  'ca': base64.b64encode(certs['ca'])})
+        if not use_keystone:
+            cfg = ("apiVersion: v1\n"
+                   "clusters:\n"
+                   "- cluster:\n"
+                   "    certificate-authority-data: %(ca)s\n"
+                   "    server: %(api_address)s\n"
+                   "  name: %(name)s\n"
+                   "contexts:\n"
+                   "- context:\n"
+                   "    cluster: %(name)s\n"
+                   "    user: admin\n"
+                   "  name: default\n"
+                   "current-context: default\n"
+                   "kind: Config\n"
+                   "preferences: {}\n"
+                   "users:\n"
+                   "- name: admin\n"
+                   "  user:\n"
+                   "    client-certificate-data: %(cert)s\n"
+                   "    client-key-data: %(key)s\n"
+                   % {'name': cluster.name,
+                      'api_address': cluster.api_address,
+                      'key': base64.encode_as_text(certs['key']),
+                      'cert': base64.encode_as_text(certs['cert']),
+                      'ca': base64.encode_as_text(certs['ca'])})
+        else:
+            cfg = ("apiVersion: v1\n"
+                   "clusters:\n"
+                   "- cluster:\n"
+                   "    certificate-authority-data: %(ca)s\n"
+                   "    server: %(api_address)s\n"
+                   "  name: %(name)s\n"
+                   "contexts:\n"
+                   "- context:\n"
+                   "    cluster: %(name)s\n"
+                   "    user: openstackuser\n"
+                   "  name: openstackuser@kubernetes\n"
+                   "current-context: openstackuser@kubernetes\n"
+                   "kind: Config\n"
+                   "preferences: {}\n"
+                   "users:\n"
+                   "- name: openstackuser\n"
+                   "  user:\n"
+                   "    exec:\n"
+                   "      command: /bin/bash\n"
+                   "      apiVersion: client.authentication.k8s.io/v1alpha1\n"
+                   "      args:\n"
+                   "      - -c\n"
+                   "      - >\n"
+                   "        if [ -z ${OS_TOKEN} ]; then\n"
+                   "            echo 'Error: Missing OpenStack credential from environment variable $OS_TOKEN' > /dev/stderr\n"  # noqa
+                   "            exit 1\n"
+                   "        else\n"
+                   "            echo '{ \"apiVersion\": \"client.authentication.k8s.io/v1alpha1\", \"kind\": \"ExecCredential\", \"status\": { \"token\": \"'\"${OS_TOKEN}\"'\"}}'\n"  # noqa
+                   "        fi\n"
+                   % {'name': cluster.name,
+                      'api_address': cluster.api_address,
+                      'ca': base64.encode_as_text(certs['ca'])})
 
     if os.path.exists(cfg_file) and not force:
         raise exc.CommandError("File %s exists, aborting." % cfg_file)
diff --git a/magnumclient/exceptions.py b/magnumclient/exceptions.py
index d069f85..8afd80a 100644
--- a/magnumclient/exceptions.py
+++ b/magnumclient/exceptions.py
@@ -18,15 +18,15 @@ from magnumclient.common.apiclient.exceptions import *  # noqa
 
 # NOTE(akurilin): This alias is left here since v.0.1.3 to support backwards
 # compatibility.
-InvalidEndpoint = EndpointException
-CommunicationError = ConnectionRefused
-HTTPBadRequest = BadRequest
-HTTPInternalServerError = InternalServerError
-HTTPNotFound = NotFound
-HTTPServiceUnavailable = ServiceUnavailable
+InvalidEndpoint = exceptions.EndpointException
+CommunicationError = exceptions.ConnectionRefused
+HTTPBadRequest = exceptions.BadRequest
+HTTPInternalServerError = exceptions.InternalServerError
+HTTPNotFound = exceptions.NotFound
+HTTPServiceUnavailable = exceptions.ServiceUnavailable
 
 
-class AmbiguousAuthSystem(ClientException):
+class AmbiguousAuthSystem(exceptions.ClientException):
     """Could not obtain token and endpoint using provided credentials."""
     pass
 
@@ -35,7 +35,7 @@ class AmbiguousAuthSystem(ClientException):
 AmbigiousAuthSystem = AmbiguousAuthSystem
 
 
-class InvalidAttribute(ClientException):
+class InvalidAttribute(exceptions.ClientException):
     pass
 
 
diff --git a/magnumclient/osc/plugin.py b/magnumclient/osc/plugin.py
index dde56fd..49309c2 100644
--- a/magnumclient/osc/plugin.py
+++ b/magnumclient/osc/plugin.py
@@ -17,7 +17,8 @@ from osc_lib import utils
 
 LOG = logging.getLogger(__name__)
 
-DEFAULT_API_VERSION = '1'
+DEFAULT_MAJOR_API_VERSION = '1'
+DEFAULT_MAGNUM_API_VERSION = 'latest'
 API_VERSION_OPTION = 'os_container_infra_api_version'
 API_NAME = 'container_infra'
 API_VERSIONS = {
@@ -37,7 +38,8 @@ def make_client(instance):
                            region_name=instance._region_name,
                            interface=instance._interface,
                            insecure=instance._insecure,
-                           ca_cert=instance._cacert)
+                           ca_cert=instance._cacert,
+                           api_version=DEFAULT_MAGNUM_API_VERSION)
     return client
 
 
@@ -49,8 +51,8 @@ def build_option_parser(parser):
         metavar='<container-infra-api-version>',
         default=utils.env(
             'OS_CONTAINER_INFRA_API_VERSION',
-            default=DEFAULT_API_VERSION),
+            default=DEFAULT_MAJOR_API_VERSION),
         help='Container-Infra API version, default=' +
-             DEFAULT_API_VERSION +
+             DEFAULT_MAJOR_API_VERSION +
              ' (Env: OS_CONTAINER_INFRA_API_VERSION)')
     return parser
diff --git a/magnumclient/osc/v1/cluster_templates.py b/magnumclient/osc/v1/cluster_templates.py
index d898af9..852ee33 100644
--- a/magnumclient/osc/v1/cluster_templates.py
+++ b/magnumclient/osc/v1/cluster_templates.py
@@ -51,7 +51,8 @@ CLUSTER_TEMPLATE_ATTRIBUTES = [
     'coe',
     'flavor_id',
     'master_lb_enabled',
-    'dns_nameserver'
+    'dns_nameserver',
+    'hidden'
 ]
 
 
@@ -221,6 +222,17 @@ class CreateClusterTemplate(command.ShowOne):
             action='append_const',
             const=False,
             help=_('Disables floating ip creation on the new Cluster'))
+        parser.add_argument(
+            '--hidden',
+            dest='hidden',
+            action='store_true',
+            default=False,
+            help=_('Indicates the cluster template should be hidden.'))
+        parser.add_argument(
+            '--visible',
+            dest='hidden',
+            action='store_false',
+            help=_('Indicates the cluster template should be visible.'))
 
         return parser
 
@@ -252,6 +264,12 @@ class CreateClusterTemplate(command.ShowOne):
             'server_type': parsed_args.server_type,
             'master_lb_enabled': parsed_args.master_lb_enabled,
         }
+
+        # NOTE (brtknr): Only supply hidden arg if it is True
+        # for backward compatibility
+        if parsed_args.hidden:
+            args['hidden'] = parsed_args.hidden
+
         if len(parsed_args.floating_ip_enabled) > 1:
             raise InvalidAttribute('--floating-ip-enabled and '
                                    '--floating-ip-disabled are '
@@ -336,6 +354,8 @@ class ListTemplateCluster(command.Lister):
 
         mag_client = self.app.client_manager.container_infra
         columns = ['uuid', 'name']
+        if parsed_args.fields:
+            columns += parsed_args.fields.split(',')
         cts = mag_client.cluster_templates.list(limit=parsed_args.limit,
                                                 sort_key=parsed_args.sort_key,
                                                 sort_dir=parsed_args.sort_dir)
diff --git a/magnumclient/osc/v1/clusters.py b/magnumclient/osc/v1/clusters.py
index ac1419a..3ab06e9 100644
--- a/magnumclient/osc/v1/clusters.py
+++ b/magnumclient/osc/v1/clusters.py
@@ -24,6 +24,7 @@ from osc_lib import utils
 
 CLUSTER_ATTRIBUTES = [
     'status',
+    'health_status',
     'cluster_template_id',
     'node_addresses',
     'uuid',
@@ -33,6 +34,9 @@ CLUSTER_ATTRIBUTES = [
     'updated_at',
     'coe_version',
     'labels',
+    'labels_overridden',
+    'labels_skipped',
+    'labels_added',
     'faults',
     'keypair',
     'api_address',
@@ -45,6 +49,8 @@ CLUSTER_ATTRIBUTES = [
     'name',
     'master_flavor_id',
     'flavor_id',
+    'health_status_reason',
+    'project_id',
 ]
 
 
@@ -113,6 +119,38 @@ class CreateCluster(command.Command):
             metavar='<flavor>',
             help=_('The nova flavor name or UUID to use when launching the '
                    'Cluster.'))
+        parser.add_argument(
+            '--fixed-network',
+            dest='fixed_network',
+            metavar='<fixed-network>',
+            help=_('The private Neutron network name to connect to this '
+                   'Cluster template.'))
+        parser.add_argument(
+            '--fixed-subnet',
+            dest='fixed_subnet',
+            metavar='<fixed-subnet>',
+            help=_('The private Neutron subnet name to connect to Cluster.'))
+        parser.add_argument(
+            '--floating-ip-enabled',
+            dest='floating_ip_enabled',
+            default=[],
+            action='append_const',
+            const=True,
+            help=_('Indicates whether created Clusters should have a '
+                   'floating ip.'))
+        parser.add_argument(
+            '--floating-ip-disabled',
+            dest='floating_ip_enabled',
+            action='append_const',
+            const=False,
+            help=_('Disables floating ip creation on the new Cluster'))
+        parser.add_argument(
+            '--merge-labels',
+            dest='merge_labels',
+            action='store_true',
+            default=False,
+            help=_('The labels provided will be merged with the labels '
+                   'configured in the specified cluster template.'))
 
         return parser
 
@@ -130,6 +168,15 @@ class CreateCluster(command.Command):
             'node_count': parsed_args.node_count,
         }
 
+        if len(parsed_args.floating_ip_enabled) > 1:
+            raise exceptions.InvalidAttribute(
+                '--floating-ip-enabled and '
+                '--floating-ip-disabled are '
+                'mutually exclusive and '
+                'should be specified only once.')
+        elif len(parsed_args.floating_ip_enabled) == 1:
+            args['floating_ip_enabled'] = parsed_args.floating_ip_enabled[0]
+
         if parsed_args.labels is not None:
             args['labels'] = magnum_utils.handle_labels(parsed_args.labels)
 
@@ -142,6 +189,17 @@ class CreateCluster(command.Command):
         if parsed_args.flavor is not None:
             args['flavor_id'] = parsed_args.flavor
 
+        if parsed_args.fixed_network is not None:
+            args["fixed_network"] = parsed_args.fixed_network
+
+        if parsed_args.fixed_subnet is not None:
+            args["fixed_subnet"] = parsed_args.fixed_subnet
+
+        if parsed_args.merge_labels:
+            # We are only sending this if it's True. This
+            # way we avoid breaking older APIs.
+            args["merge_labels"] = parsed_args.merge_labels
+
         cluster = mag_client.clusters.create(**args)
         print("Request to create cluster %s accepted"
               % cluster.uuid)
@@ -197,7 +255,8 @@ class ListCluster(command.Lister):
 
         mag_client = self.app.client_manager.container_infra
         columns = [
-            'uuid', 'name', 'keypair', 'node_count', 'master_count', 'status']
+            'uuid', 'name', 'keypair', 'node_count', 'master_count', 'status',
+            'health_status']
         clusters = mag_client.clusters.list(limit=parsed_args.limit,
                                             sort_key=parsed_args.sort_key,
                                             sort_dir=parsed_args.sort_dir)
@@ -305,6 +364,18 @@ class ConfigCluster(command.Command):
             dest='output_certs',
             default=False,
             help=_('Output certificates in separate files.'))
+        parser.add_argument(
+            '--use-certificate',
+            action='store_true',
+            dest='use_certificate',
+            default=True,
+            help=_('Use certificate in config files.'))
+        parser.add_argument(
+            '--use-keystone',
+            action='store_true',
+            dest='use_keystone',
+            default=False,
+            help=_('Use Keystone token in config files.'))
 
         return parser
 
@@ -315,16 +386,21 @@ class ConfigCluster(command.Command):
         the corresponding COE configured to access the cluster.
 
         """
+        if parsed_args.use_keystone:
+            parsed_args.use_certificate = False
+        if not parsed_args.use_certificate:
+            parsed_args.use_keystone = True
+
         self.log.debug("take_action(%s)", parsed_args)
 
         mag_client = self.app.client_manager.container_infra
 
         parsed_args.dir = os.path.abspath(parsed_args.dir)
         cluster = mag_client.clusters.get(parsed_args.cluster)
-        if cluster.status not in ('CREATE_COMPLETE', 'UPDATE_COMPLETE',
-                                  'ROLLBACK_COMPLETE'):
-            raise exceptions.CommandError("cluster in status %s" %
-                                          cluster.status)
+        if cluster.api_address is None:
+            self.log.warning("WARNING: The cluster's api_address is"
+                             " not known yet.")
+
         cluster_template = mag_client.cluster_templates.get(
             cluster.cluster_template_id)
         opts = {
@@ -346,8 +422,92 @@ class ConfigCluster(command.Command):
                         with open(fname, "w") as f:
                             f.write(tls[k])
 
-        print(magnum_utils.config_cluster(cluster,
-                                          cluster_template,
-                                          parsed_args.dir,
-                                          force=parsed_args.force,
-                                          certs=tls))
+        print(magnum_utils.config_cluster(
+            cluster, cluster_template, parsed_args.dir,
+            force=parsed_args.force, certs=tls,
+            use_keystone=parsed_args.use_keystone))
+
+
+class ResizeCluster(command.Command):
+    _description = _("Resize a Cluster")
+
+    def get_parser(self, prog_name):
+        parser = super(ResizeCluster, self).get_parser(prog_name)
+        parser.add_argument(
+            'cluster',
+            metavar='<cluster>',
+            help=_('The name or UUID of cluster to update'))
+
+        parser.add_argument(
+            'node_count',
+            type=int,
+            help=_("Desired node count of the cluser."))
+
+        parser.add_argument(
+            '--nodes-to-remove',
+            metavar='<Server UUID>',
+            action='append',
+            help=_("Server ID of the nodes to be removed. Repeat to add"
+                   "more server ID"))
+
+        parser.add_argument(
+            '--nodegroup',
+            metavar='<nodegroup>',
+            help=_('The name or UUID of the nodegroup of current cluster.'))
+
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        mag_client = self.app.client_manager.container_infra
+        cluster = mag_client.clusters.get(parsed_args.cluster)
+
+        mag_client.clusters.resize(cluster.uuid,
+                                   parsed_args.node_count,
+                                   parsed_args.nodes_to_remove,
+                                   parsed_args.nodegroup)
+        print("Request to resize cluster %s has been accepted." %
+              parsed_args.cluster)
+
+
+class UpgradeCluster(command.Command):
+    _description = _("Upgrade a Cluster")
+
+    def get_parser(self, prog_name):
+        parser = super(UpgradeCluster, self).get_parser(prog_name)
+        parser.add_argument(
+            'cluster',
+            metavar='<cluster>',
+            help=_('The name or UUID of cluster to update'))
+
+        parser.add_argument(
+            'cluster_template',
+            help=_("The new cluster template ID will be upgraded to."))
+
+        parser.add_argument(
+            '--max-batch-size',
+            metavar='<max_batch_size>',
+            type=int,
+            default=1,
+            help=_("The max batch size for upgrading each time."))
+
+        parser.add_argument(
+            '--nodegroup',
+            metavar='<nodegroup>',
+            help=_('The name or UUID of the nodegroup of current cluster.'))
+
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        mag_client = self.app.client_manager.container_infra
+        cluster = mag_client.clusters.get(parsed_args.cluster)
+
+        mag_client.clusters.upgrade(cluster.uuid,
+                                    parsed_args.cluster_template,
+                                    parsed_args.max_batch_size,
+                                    parsed_args.nodegroup)
+        print("Request to upgrade cluster %s has been accepted." %
+              parsed_args.cluster)
diff --git a/magnumclient/osc/v1/nodegroups.py b/magnumclient/osc/v1/nodegroups.py
new file mode 100644
index 0000000..afb5870
--- /dev/null
+++ b/magnumclient/osc/v1/nodegroups.py
@@ -0,0 +1,301 @@
+# Copyright (c) 2018 European Organization for Nuclear Research.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from magnumclient.common import utils as magnum_utils
+from magnumclient.i18n import _
+
+from osc_lib.command import command
+from osc_lib import utils
+
+
+NODEGROUP_ATTRIBUTES = [
+    'uuid',
+    'name',
+    'cluster_id',
+    'project_id',
+    'docker_volume_size',
+    'labels',
+    'labels_overridden',
+    'labels_skipped',
+    'labels_added',
+    'flavor_id',
+    'image_id',
+    'node_addresses',
+    'node_count',
+    'role',
+    'max_node_count',
+    'min_node_count',
+    'is_default',
+    'stack_id',
+    'status',
+    'status_reason',
+]
+
+
+class CreateNodeGroup(command.Command):
+    _description = _("Create a nodegroup")
+
+    def get_parser(self, prog_name):
+        parser = super(CreateNodeGroup, self).get_parser(prog_name)
+        # NOTE: All arguments are positional and, if not provided
+        # with a default, required.
+        parser.add_argument('--docker-volume-size',
+                            dest='docker_volume_size',
+                            type=int,
+                            metavar='<docker-volume-size>',
+                            help=('The size in GB for the docker volume to '
+                                  'use.'))
+        parser.add_argument('--labels',
+                            metavar='<KEY1=VALUE1,KEY2=VALUE2;KEY3=VALUE3...>',
+                            action='append',
+                            help=_('Arbitrary labels in the form of key=value'
+                                   'pairs to associate with a nodegroup. '
+                                   'May be used multiple times.'))
+        parser.add_argument('cluster',
+                            metavar='<cluster>',
+                            help='Name of the nodegroup to create.')
+        parser.add_argument('name',
+                            metavar='<name>',
+                            help='Name of the nodegroup to create.')
+        parser.add_argument('--node-count',
+                            dest='node_count',
+                            type=int,
+                            default=1,
+                            metavar='<node-count>',
+                            help='The nodegroup node count.')
+        parser.add_argument('--min-nodes',
+                            dest='min_node_count',
+                            type=int,
+                            default=1,
+                            metavar='<min-nodes>',
+                            help='The nodegroup minimum node count.')
+        parser.add_argument('--max-nodes',
+                            dest='max_node_count',
+                            type=int,
+                            default=None,
+                            metavar='<max-nodes>',
+                            help='The nodegroup maximum node count.')
+        parser.add_argument('--role',
+                            dest='role',
+                            type=str,
+                            default='worker',
+                            metavar='<role>',
+                            help=('The role of the nodegroup'))
+        parser.add_argument(
+            '--image',
+            metavar='<image>',
+            help=_('The name or UUID of the base image to customize for the '
+                   'NodeGroup.'))
+        parser.add_argument(
+            '--flavor',
+            metavar='<flavor>',
+            help=_('The nova flavor name or UUID to use when launching the '
+                   'nodes in this NodeGroup.'))
+        parser.add_argument(
+            '--merge-labels',
+            dest='merge_labels',
+            action='store_true',
+            default=False,
+            help=_('The labels provided will be merged with the labels '
+                   'configured in the specified cluster.'))
+
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        mag_client = self.app.client_manager.container_infra
+        args = {
+            'name': parsed_args.name,
+            'node_count': parsed_args.node_count,
+            'max_node_count': parsed_args.max_node_count,
+            'min_node_count': parsed_args.min_node_count,
+            'role': parsed_args.role,
+        }
+
+        if parsed_args.labels is not None:
+            args['labels'] = magnum_utils.handle_labels(parsed_args.labels)
+
+        if parsed_args.docker_volume_size is not None:
+            args['docker_volume_size'] = parsed_args.docker_volume_size
+
+        if parsed_args.flavor is not None:
+            args['flavor_id'] = parsed_args.flavor
+
+        if parsed_args.image is not None:
+            args['image_id'] = parsed_args.image
+
+        if parsed_args.merge_labels:
+            # We are only sending this if it's True. This
+            # way we avoid breaking older APIs.
+            args["merge_labels"] = parsed_args.merge_labels
+
+        cluster_id = parsed_args.cluster
+        nodegroup = mag_client.nodegroups.create(cluster_id, **args)
+        print("Request to create nodegroup %s accepted"
+              % nodegroup.uuid)
+
+
+class DeleteNodeGroup(command.Command):
+    _description = _("Delete a nodegroup")
+
+    def get_parser(self, prog_name):
+        parser = super(DeleteNodeGroup, self).get_parser(prog_name)
+        parser.add_argument(
+            'cluster',
+            metavar='<cluster>',
+            help=_('ID or name of the cluster where the nodegroup(s) '
+                   'belong(s).'))
+        parser.add_argument(
+            'nodegroup',
+            nargs='+',
+            metavar='<nodegroup>',
+            help='ID or name of the nodegroup(s) to delete.')
+
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        mag_client = self.app.client_manager.container_infra
+        cluster_id = parsed_args.cluster
+        for ng in parsed_args.nodegroup:
+            mag_client.nodegroups.delete(cluster_id, ng)
+            print("Request to delete nodegroup %s has been accepted." % ng)
+
+
+class ListNodeGroup(command.Lister):
+    _description = _("List nodegroups")
+
+    def get_parser(self, prog_name):
+        parser = super(ListNodeGroup, self).get_parser(prog_name)
+
+        parser.add_argument(
+            'cluster',
+            metavar='<cluster>',
+            help=_('ID or name of the cluster where the nodegroup belongs.'))
+        parser.add_argument(
+            '--limit',
+            metavar='<limit>',
+            type=int,
+            help=_('Maximum number of nodegroups to return'))
+        parser.add_argument(
+            '--sort-key',
+            metavar='<sort-key>',
+            help=_('Column to sort results by'))
+        parser.add_argument(
+            '--sort-dir',
+            metavar='<sort-dir>',
+            choices=['desc', 'asc'],
+            help=_('Direction to sort. "asc" or "desc".'))
+        parser.add_argument(
+            '--role',
+            metavar='<role>',
+            help=_('List the nodegroups in the cluster with this role'))
+
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        mag_client = self.app.client_manager.container_infra
+        columns = ['uuid', 'name', 'flavor_id', 'image_id', 'node_count',
+                   'status', 'role']
+        cluster_id = parsed_args.cluster
+        nodegroups = mag_client.nodegroups.list(cluster_id,
+                                                limit=parsed_args.limit,
+                                                sort_key=parsed_args.sort_key,
+                                                sort_dir=parsed_args.sort_dir,
+                                                role=parsed_args.role)
+        return (
+            columns,
+            (utils.get_item_properties(n, columns) for n in nodegroups)
+        )
+
+
+class ShowNodeGroup(command.ShowOne):
+    _description = _("Show a nodegroup")
+
+    def get_parser(self, prog_name):
+        parser = super(ShowNodeGroup, self).get_parser(prog_name)
+        parser.add_argument(
+            'cluster',
+            metavar='<cluster>',
+            help=_('ID or name of the cluster where the nodegroup belongs.'))
+        parser.add_argument(
+            'nodegroup',
+            metavar='<nodegroup>',
+            help=_('ID or name of the nodegroup to show.')
+            )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        columns = NODEGROUP_ATTRIBUTES
+
+        mag_client = self.app.client_manager.container_infra
+        cluster_id = parsed_args.cluster
+        nodegroup = mag_client.nodegroups.get(cluster_id,
+                                              parsed_args.nodegroup)
+
+        return (columns, utils.get_item_properties(nodegroup, columns))
+
+
+class UpdateNodeGroup(command.Command):
+    _description = _("Update a Nodegroup")
+
+    def get_parser(self, prog_name):
+        parser = super(UpdateNodeGroup, self).get_parser(prog_name)
+        parser.add_argument(
+            'cluster',
+            metavar='<cluster>',
+            help=_('ID or name of the cluster where the nodegroup belongs.'))
+        parser.add_argument(
+            'nodegroup',
+            metavar='<nodegroup>',
+            help=_('The name or UUID of cluster to update'))
+
+        parser.add_argument(
+            'op',
+            metavar='<op>',
+            choices=['add', 'replace', 'remove'],
+            help=_("Operations: one of 'add', 'replace' or 'remove'"))
+
+        parser.add_argument(
+            'attributes',
+            metavar='<path=value>',
+            nargs='+',
+            action='append',
+            default=[],
+            help=_(
+                "Attributes to add/replace or remove (only PATH is necessary "
+                "on remove)"))
+
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        mag_client = self.app.client_manager.container_infra
+
+        patch = magnum_utils.args_array_to_patch(parsed_args.op,
+                                                 parsed_args.attributes[0])
+
+        cluster_id = parsed_args.cluster
+        mag_client.nodegroups.update(cluster_id, parsed_args.nodegroup,
+                                     patch)
+        print("Request to update nodegroup %s has been accepted." %
+              parsed_args.nodegroup)
diff --git a/magnumclient/shell.py b/magnumclient/shell.py
index 259f1ad..9da9255 100644
--- a/magnumclient/shell.py
+++ b/magnumclient/shell.py
@@ -33,6 +33,13 @@ from oslo_utils import importutils
 from oslo_utils import strutils
 import six
 
+from magnumclient.common import cliutils
+from magnumclient import exceptions as exc
+from magnumclient.i18n import _
+from magnumclient.v1 import client as client_v1
+from magnumclient.v1 import shell as shell_v1
+from magnumclient import version
+
 profiler = importutils.try_import("osprofiler.profiler")
 
 HAS_KEYRING = False
@@ -51,12 +58,6 @@ try:
 except ImportError:
     pass
 
-from magnumclient.common import cliutils
-from magnumclient import exceptions as exc
-from magnumclient.i18n import _
-from magnumclient.v1 import client as client_v1
-from magnumclient.v1 import shell as shell_v1
-from magnumclient import version
 
 LATEST_API_VERSION = ('1', 'latest')
 DEFAULT_INTERFACE = 'public'
diff --git a/magnumclient/tests/osc/unit/osc_fakes.py b/magnumclient/tests/osc/unit/osc_fakes.py
index 2df0686..b9e8086 100644
--- a/magnumclient/tests/osc/unit/osc_fakes.py
+++ b/magnumclient/tests/osc/unit/osc_fakes.py
@@ -13,13 +13,12 @@
 #   under the License.
 #
 
-import json
 import mock
+from oslo_serialization import jsonutils
 import sys
 
 from keystoneauth1 import fixture
 import requests
-import six
 
 AUTH_TOKEN = "foobar"
 AUTH_URL = "http://0.0.0.0"
@@ -239,9 +238,7 @@ class FakeResponse(requests.Response):
         self.status_code = status_code
 
         self.headers.update(headers)
-        self._content = json.dumps(data)
-        if not isinstance(self._content, six.binary_type):
-            self._content = self._content.encode()
+        self._content = jsonutils.dump_as_bytes(data)
 
 
 class FakeModel(dict):
diff --git a/magnumclient/tests/osc/unit/v1/fakes.py b/magnumclient/tests/osc/unit/v1/fakes.py
index df11d41..4181010 100644
--- a/magnumclient/tests/osc/unit/v1/fakes.py
+++ b/magnumclient/tests/osc/unit/v1/fakes.py
@@ -62,14 +62,38 @@ class FakeQuotasModelManager(object):
         pass
 
 
+class FakeNodeGroupManager(object):
+    def list(self, cluster_id, limit=None, marker=None, sort_key=None,
+             sort_dir=None, detail=False):
+        pass
+
+    def get(self, cluster_id, id):
+        pass
+
+    def create(self, cluster_id, **kwargs):
+        pass
+
+    def delete(self, cluster_id, id):
+        pass
+
+    def update(self, cluster_id, id, patch):
+        pass
+
+
+class FakeCertificatesModelManager(FakeBaseModelManager):
+    def get(self, cluster_uuid):
+        pass
+
+
 class MagnumFakeContainerInfra(object):
     def __init__(self):
         self.cluster_templates = FakeBaseModelManager()
         self.clusters = FakeBaseModelManager()
         self.mservices = FakeBaseModelManager()
-        self.certificates = FakeBaseModelManager()
+        self.certificates = FakeCertificatesModelManager()
         self.stats = FakeStatsModelManager()
         self.quotas = FakeQuotasModelManager()
+        self.nodegroups = FakeNodeGroupManager()
 
 
 class MagnumFakeClientManager(osc_fakes.FakeClientManager):
@@ -160,7 +184,8 @@ class FakeClusterTemplate(object):
             'coe': 'kubernetes',
             'flavor_id': 'm1.medium',
             'master_lb_enabled': False,
-            'dns_nameserver': '8.8.8.8'
+            'dns_nameserver': '8.8.8.8',
+            'hidden': False
         }
 
         # Overwrite default attributes.
@@ -205,12 +230,16 @@ class FakeCluster(object):
         # set default attributes.
         cluster_info = {
             'status': 'CREATE_IN_PROGRESS',
+            'health_status': 'HEALTHY',
             'cluster_template_id': 'fake-ct',
             'node_addresses': [],
             'uuid': '3a369884-b6ba-484f-a206-919b4b718aff',
             'stack_id': 'c4554582-77bd-4734-8f1a-72c3c40e5fb4',
             'status_reason': None,
             'labels': {},
+            'labels_overridden': {},
+            'labels_added': {},
+            'labels_skipped': {},
             'created_at': '2017-03-16T18:40:39+00:00',
             'updated_at': '2017-03-16T18:40:45+00:00',
             'coe_version': None,
@@ -227,6 +256,7 @@ class FakeCluster(object):
             'master_flavor_id': None,
             'flavor_id': 'm1.medium',
             'project_id': None,
+            'health_status_reason': {'api': 'ok'}
         }
 
         # Overwrite default attributes.
@@ -237,6 +267,11 @@ class FakeCluster(object):
         return cluster
 
 
+class FakeCert(object):
+    def __init__(self, pem):
+        self.pem = pem
+
+
 class FakeQuota(object):
     """Fake one or more Quota"""
 
@@ -266,3 +301,52 @@ class FakeQuota(object):
         quota = osc_fakes.FakeResource(info=copy.deepcopy(quota_info),
                                        loaded=True)
         return quota
+
+
+class FakeNodeGroup(object):
+    """Fake one or more NodeGroup."""
+
+    @staticmethod
+    def create_one_nodegroup(attrs=None):
+        """Create a fake NodeGroup.
+
+        :param Dictionary attrs:
+            A dictionary with all attributes
+        :return:
+            A FakeResource object, with flavor_id, image_id, and so on
+        """
+
+        attrs = attrs or {}
+
+        # set default attributes.
+        nodegroup_info = {
+            'created_at': '2017-03-16T18:40:39+00:00',
+            'updated_at': '2017-03-16T18:40:45+00:00',
+            'uuid': '3a369884-b6ba-484f-a206-919b4b718aff',
+            'cluster_id': 'fake-cluster',
+            'docker_volume_size': None,
+            'node_addresses': [],
+            'labels': {},
+            'labels_overridden': {},
+            'labels_added': {},
+            'labels_skipped': {},
+            'node_count': 1,
+            'name': 'fake-nodegroup',
+            'flavor_id': 'm1.medium',
+            'image_id': 'fedora-latest',
+            'project_id': None,
+            'role': 'worker',
+            'max_node_count': 10,
+            'min_node_count': 1,
+            'is_default': False,
+            'stack_id': '3a369884-b6ba-484f-fake-stackb718aff',
+            'status': 'CREATE_COMPLETE',
+            'status_reason': 'None'
+        }
+
+        # Overwrite default attributes.
+        nodegroup_info.update(attrs)
+
+        nodegroup = osc_fakes.FakeResource(info=copy.deepcopy(nodegroup_info),
+                                           loaded=True)
+        return nodegroup
diff --git a/magnumclient/tests/osc/unit/v1/test_cluster_templates.py b/magnumclient/tests/osc/unit/v1/test_cluster_templates.py
index 5321687..b5c1c35 100644
--- a/magnumclient/tests/osc/unit/v1/test_cluster_templates.py
+++ b/magnumclient/tests/osc/unit/v1/test_cluster_templates.py
@@ -48,7 +48,7 @@ class TestClusterTemplate(magnum_fakes.TestMagnumClientOSCV1):
         'registry_enabled': False,
         'server_type': 'vm',
         'tls_disabled': False,
-        'volume_driver': None
+        'volume_driver': None,
     }
 
     def setUp(self):
@@ -271,22 +271,24 @@ class TestClusterTemplateList(TestClusterTemplate):
             '--limit', '1',
             '--sort-key', 'key',
             '--sort-dir', 'asc',
-            '--fields', 'fields'
+            '--fields', 'field1,field2'
         ]
         verifylist = [
             ('limit', 1),
             ('sort_key', 'key'),
             ('sort_dir', 'asc'),
-            ('fields', 'fields'),
+            ('fields', 'field1,field2'),
         ]
+        verifycolumns = self.columns + ['field1', 'field2']
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.cmd.take_action(parsed_args)
+        columns, data = self.cmd.take_action(parsed_args)
         self.cluster_templates_mock.list.assert_called_with(
             limit=1,
             sort_dir='asc',
             sort_key='key',
         )
+        self.assertEqual(verifycolumns, columns)
 
     def test_cluster_template_list_bad_sort_dir_fail(self):
         arglist = [
diff --git a/magnumclient/tests/osc/unit/v1/test_clusters.py b/magnumclient/tests/osc/unit/v1/test_clusters.py
index 4783c13..2530796 100644
--- a/magnumclient/tests/osc/unit/v1/test_clusters.py
+++ b/magnumclient/tests/osc/unit/v1/test_clusters.py
@@ -37,6 +37,8 @@ class TestCluster(magnum_fakes.TestMagnumClientOSCV1):
         super(TestCluster, self).setUp()
 
         self.clusters_mock = self.app.client_manager.container_infra.clusters
+        self.certificates_mock = \
+            self.app.client_manager.container_infra.certificates
 
 
 class TestClusterCreate(TestCluster):
@@ -181,7 +183,8 @@ class TestClusterList(TestCluster):
         'keypair',
         'node_count',
         'master_count',
-        'status'
+        'status',
+        'health_status'
     ]
 
     datalist = (
@@ -191,7 +194,8 @@ class TestClusterList(TestCluster):
             _cluster.keypair,
             _cluster.node_count,
             _cluster.master_count,
-            _cluster.status
+            _cluster.status,
+            _cluster.health_status,
         ),
     )
 
@@ -360,10 +364,15 @@ class TestClusterConfig(TestCluster):
         self.clusters_mock.get = mock.Mock()
         self.clusters_mock.get.return_value = self._cluster
 
+        cert = magnum_fakes.FakeCert(pem='foo bar')
+        self.certificates_mock.create = mock.Mock()
+        self.certificates_mock.create.return_value = cert
+        self.certificates_mock.get = mock.Mock()
+        self.certificates_mock.get.return_value = cert
+
         # Fake the cluster_template
         attr = dict()
         attr['name'] = 'fake-ct'
-        attr['tls_disabled'] = True
         self._cluster_template = \
             magnum_fakes.FakeClusterTemplate.create_one_cluster_template(attr)
 
@@ -459,14 +468,65 @@ export KUBECONFIG={}/config
 
         self.clusters_mock.get.assert_called_with('fake-cluster')
 
-    def test_cluster_config_with_in_progress_status(self):
-        self._cluster.status = 'CREATE_IN_PROGRESS'
 
-        arglist = ['fake-cluster-1']
+class TestClusterResize(TestCluster):
+
+    def setUp(self):
+        super(TestClusterResize, self).setUp()
+        self.cluster = mock.Mock()
+        self.cluster.uuid = "UUID1"
+        self.clusters_mock.resize = mock.Mock()
+        self.clusters_mock.resize.return_value = None
+
+        self.clusters_mock.get = mock.Mock()
+        self.clusters_mock.get.return_value = self.cluster
+
+        # Get the command object to test
+        self.cmd = osc_clusters.ResizeCluster(self.app, None)
+
+    def test_cluster_resize_pass(self):
+        arglist = ['foo', '2']
         verifylist = [
-            ('cluster', 'fake-cluster-1')
+            ('cluster', 'foo'),
+            ('node_count', 2),
+            ('nodes_to_remove', None),
+            ('nodegroup', None)
         ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+        self.clusters_mock.resize.assert_called_with(
+            "UUID1", 2, None, None
+        )
+
+
+class TestClusterUpgrade(TestCluster):
 
+    def setUp(self):
+        super(TestClusterUpgrade, self).setUp()
+        self.cluster = mock.Mock()
+        self.cluster.uuid = "UUID1"
+        self.clusters_mock.upgrade = mock.Mock()
+        self.clusters_mock.upgrade.return_value = None
+
+        self.clusters_mock.get = mock.Mock()
+        self.clusters_mock.get.return_value = self.cluster
+
+        # Get the command object to test
+        self.cmd = osc_clusters.UpgradeCluster(self.app, None)
+
+    def test_cluster_upgrade_pass(self):
+        cluster_template_id = 'TEMPLATE_ID'
+        arglist = ['foo', cluster_template_id]
+        verifylist = [
+            ('cluster', 'foo'),
+            ('cluster_template', cluster_template_id),
+            ('max_batch_size', 1),
+            ('nodegroup', None)
+        ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.assertRaises(exceptions.CommandError,
-                          self.cmd.take_action, parsed_args)
+
+        self.cmd.take_action(parsed_args)
+        self.clusters_mock.upgrade.assert_called_with(
+            "UUID1", cluster_template_id, 1, None
+        )
diff --git a/magnumclient/tests/osc/unit/v1/test_nodegroups.py b/magnumclient/tests/osc/unit/v1/test_nodegroups.py
new file mode 100644
index 0000000..06f1b55
--- /dev/null
+++ b/magnumclient/tests/osc/unit/v1/test_nodegroups.py
@@ -0,0 +1,333 @@
+# Copyright (c) 2018 European Organization for Nuclear Research.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import copy
+import mock
+from mock import call
+
+from magnumclient.osc.v1 import nodegroups as osc_nodegroups
+from magnumclient.tests.osc.unit.v1 import fakes as magnum_fakes
+
+
+class TestNodeGroup(magnum_fakes.TestMagnumClientOSCV1):
+
+    def setUp(self):
+        super(TestNodeGroup, self).setUp()
+        self.ng_mock = self.app.client_manager.container_infra.nodegroups
+
+
+class TestNodeGroupCreate(TestNodeGroup):
+
+    def setUp(self):
+        super(TestNodeGroupCreate, self).setUp()
+        self.nodegroup = magnum_fakes.FakeNodeGroup.create_one_nodegroup()
+
+        self.ng_mock.create = mock.Mock()
+        self.ng_mock.create.return_value = self.nodegroup
+
+        self.ng_mock.get = mock.Mock()
+        self.ng_mock.get.return_value = copy.deepcopy(self.nodegroup)
+
+        self.ng_mock.update = mock.Mock()
+        self.ng_mock.update.return_value = self.nodegroup
+
+        self._default_args = {
+            'name': 'fake-nodegroup',
+            'node_count': 1,
+            'role': 'worker',
+            'min_node_count': 1,
+            'max_node_count': None,
+        }
+
+        # Get the command object to test
+        self.cmd = osc_nodegroups.CreateNodeGroup(self.app, None)
+
+        self.data = tuple(map(lambda x: getattr(self.nodegroup, x),
+                              osc_nodegroups.NODEGROUP_ATTRIBUTES))
+
+    def test_nodegroup_create_required_args_pass(self):
+        """Verifies required arguments."""
+
+        arglist = [
+            self.nodegroup.cluster_id,
+            self.nodegroup.name
+        ]
+        verifylist = [
+            ('cluster', self.nodegroup.cluster_id),
+            ('name', self.nodegroup.name)
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+        self.ng_mock.create.assert_called_with(self.nodegroup.cluster_id,
+                                               **self._default_args)
+
+    def test_nodegroup_create_missing_required_arg(self):
+        """Verifies missing required arguments."""
+
+        arglist = [
+            self.nodegroup.name
+        ]
+        verifylist = [
+            ('name', self.nodegroup.name)
+        ]
+        self.assertRaises(magnum_fakes.MagnumParseException,
+                          self.check_parser, self.cmd, arglist, verifylist)
+
+    def test_nodegroup_create_with_labels(self):
+        """Verifies labels are properly parsed when given as argument."""
+
+        expected_args = self._default_args
+        expected_args['labels'] = {
+            'arg1': 'value1', 'arg2': 'value2'
+        }
+
+        arglist = [
+            '--labels', 'arg1=value1',
+            '--labels', 'arg2=value2',
+            self.nodegroup.cluster_id,
+            self.nodegroup.name
+        ]
+        verifylist = [
+            ('labels', ['arg1=value1', 'arg2=value2']),
+            ('name', self.nodegroup.name),
+            ('cluster', self.nodegroup.cluster_id)
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+        self.ng_mock.create.assert_called_with(self.nodegroup.cluster_id,
+                                               **expected_args)
+
+
+class TestNodeGroupDelete(TestNodeGroup):
+
+    def setUp(self):
+        super(TestNodeGroupDelete, self).setUp()
+
+        self.ng_mock.delete = mock.Mock()
+        self.ng_mock.delete.return_value = None
+
+        # Get the command object to test
+        self.cmd = osc_nodegroups.DeleteNodeGroup(self.app, None)
+
+    def test_nodegroup_delete_one(self):
+        arglist = ['foo', 'fake-nodegroup']
+        verifylist = [
+            ('cluster', 'foo'),
+            ('nodegroup', ['fake-nodegroup'])
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+        self.ng_mock.delete.assert_called_with('foo', 'fake-nodegroup')
+
+    def test_nodegroup_delete_multiple(self):
+        arglist = ['foo', 'fake-nodegroup1', 'fake-nodegroup2']
+        verifylist = [
+            ('cluster', 'foo'),
+            ('nodegroup', ['fake-nodegroup1', 'fake-nodegroup2'])
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+        self.ng_mock.delete.assert_has_calls(
+            [call('foo', 'fake-nodegroup1'), call('foo', 'fake-nodegroup2')]
+        )
+
+    def test_nodegroup_delete_no_args(self):
+        arglist = []
+        verifylist = [
+            ('cluster', ''),
+            ('nodegroup', [])
+        ]
+
+        self.assertRaises(magnum_fakes.MagnumParseException,
+                          self.check_parser, self.cmd, arglist, verifylist)
+
+
+class TestNodeGroupUpdate(TestNodeGroup):
+
+    def setUp(self):
+        super(TestNodeGroupUpdate, self).setUp()
+
+        self.ng_mock.update = mock.Mock()
+        self.ng_mock.update.return_value = None
+
+        # Get the command object to test
+        self.cmd = osc_nodegroups.UpdateNodeGroup(self.app, None)
+
+    def test_nodegroup_update_pass(self):
+        arglist = ['foo', 'ng1', 'remove', 'bar']
+        verifylist = [
+            ('cluster', 'foo'),
+            ('nodegroup', 'ng1'),
+            ('op', 'remove'),
+            ('attributes', [['bar']])
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+        self.ng_mock.update.assert_called_with(
+            'foo', 'ng1',
+            [{'op': 'remove', 'path': '/bar'}]
+        )
+
+    def test_nodegroup_update_bad_op(self):
+        arglist = ['cluster', 'ng1', 'foo', 'bar']
+        verifylist = [
+            ('cluster', 'cluster'),
+            ('nodegroup', 'ng1'),
+            ('op', 'foo'),
+            ('attributes', ['bar'])
+        ]
+
+        self.assertRaises(magnum_fakes.MagnumParseException,
+                          self.check_parser, self.cmd, arglist, verifylist)
+
+
+class TestNodeGroupShow(TestNodeGroup):
+
+    def setUp(self):
+        super(TestNodeGroupShow, self).setUp()
+
+        self.nodegroup = magnum_fakes.FakeNodeGroup.create_one_nodegroup()
+        self.ng_mock.get = mock.Mock()
+        self.ng_mock.get.return_value = self.nodegroup
+
+        self.data = tuple(map(lambda x: getattr(self.nodegroup, x),
+                              osc_nodegroups.NODEGROUP_ATTRIBUTES))
+
+        # Get the command object to test
+        self.cmd = osc_nodegroups.ShowNodeGroup(self.app, None)
+
+    def test_nodegroup_show_pass(self):
+        arglist = ['fake-cluster', 'fake-nodegroup']
+        verifylist = [
+            ('cluster', 'fake-cluster'),
+            ('nodegroup', 'fake-nodegroup')
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+        self.ng_mock.get.assert_called_with(
+            'fake-cluster', 'fake-nodegroup')
+        self.assertEqual(osc_nodegroups.NODEGROUP_ATTRIBUTES, columns)
+        self.assertEqual(self.data, data)
+
+    def test_nodegroup_show_no_nodegroup_fail(self):
+        arglist = ['fake-cluster']
+        verifylist = [
+            ('cluster', 'fake-cluster'),
+            ('nodegroup', '')
+        ]
+
+        self.assertRaises(magnum_fakes.MagnumParseException,
+                          self.check_parser, self.cmd, arglist, verifylist)
+
+    def test_nodegroup_show_no_args(self):
+        arglist = []
+        verifylist = [
+            ('cluster', ''),
+            ('nodegroup', '')
+        ]
+
+        self.assertRaises(magnum_fakes.MagnumParseException,
+                          self.check_parser, self.cmd, arglist, verifylist)
+
+
+class TestNodeGroupList(TestNodeGroup):
+
+    nodegroup = magnum_fakes.FakeNodeGroup.create_one_nodegroup()
+
+    columns = ['uuid', 'name', 'flavor_id', 'image_id', 'node_count',
+               'status', 'role']
+
+    datalist = (
+        (
+            nodegroup.uuid,
+            nodegroup.name,
+            nodegroup.flavor_id,
+            nodegroup.image_id,
+            nodegroup.node_count,
+            nodegroup.status,
+            nodegroup.role,
+        ),
+    )
+
+    def setUp(self):
+        super(TestNodeGroupList, self).setUp()
+        self.ng_mock.list = mock.Mock()
+        self.ng_mock.list.return_value = [self.nodegroup]
+
+        # Get the command object to test
+        self.cmd = osc_nodegroups.ListNodeGroup(self.app, None)
+
+    def test_nodegroup_list_no_options(self):
+        arglist = []
+        verifylist = [
+            ('cluster', ''),
+            ('limit', None),
+            ('sort_key', None),
+            ('sort_dir', None),
+        ]
+        self.assertRaises(magnum_fakes.MagnumParseException,
+                          self.check_parser, self.cmd, arglist, verifylist)
+
+    def test_nodegroup_list_ok(self):
+        arglist = ['fake-cluster']
+        verifylist = [
+            ('cluster', 'fake-cluster'),
+            ('limit', None),
+            ('sort_key', None),
+            ('sort_dir', None),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+        self.ng_mock.list.assert_called_with(
+            'fake-cluster',
+            limit=None,
+            sort_dir=None,
+            sort_key=None,
+            role=None,
+        )
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist, tuple(data))
+
+    def test_nodegroup_list_options(self):
+        arglist = [
+            'fake-cluster',
+            '--limit', '1',
+            '--sort-key', 'key',
+            '--sort-dir', 'asc'
+        ]
+        verifylist = [
+            ('cluster', 'fake-cluster'),
+            ('limit', 1),
+            ('sort_key', 'key'),
+            ('sort_dir', 'asc')
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+        self.ng_mock.list.assert_called_with(
+            'fake-cluster',
+            limit=1,
+            sort_dir='asc',
+            sort_key='key',
+            role=None
+        )
diff --git a/magnumclient/tests/test_httpclient.py b/magnumclient/tests/test_httpclient.py
index 205ff14..f045c9c 100644
--- a/magnumclient/tests/test_httpclient.py
+++ b/magnumclient/tests/test_httpclient.py
@@ -13,9 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
-
 import mock
+from oslo_serialization import jsonutils
 import six
 import socket
 
@@ -37,7 +36,7 @@ def _get_error_body(faultstring=None, debuginfo=None, err_type=NORMAL_ERROR):
             'faultstring': faultstring,
             'debuginfo': debuginfo
         }
-        raw_error_body = json.dumps(error_body)
+        raw_error_body = jsonutils.dumps(error_body)
         body = {'error_message': raw_error_body}
     elif err_type == ERROR_DICT:
         body = {'error': {'title': faultstring, 'message': debuginfo}}
@@ -47,7 +46,7 @@ def _get_error_body(faultstring=None, debuginfo=None, err_type=NORMAL_ERROR):
     elif err_type == ERROR_LIST_WITH_DESC:
         main_body = {'title': faultstring, 'description': debuginfo}
         body = {'errors': [main_body]}
-    raw_body = json.dumps(body)
+    raw_body = jsonutils.dumps(body)
     return raw_body
 
 
@@ -347,7 +346,7 @@ class HttpClientTest(utils.BaseTestCase):
         resp, body = client.json_request('GET', '/v1/resources')
 
         self.assertEqual(resp, fake_resp)
-        self.assertEqual(json.dumps(body), err)
+        self.assertEqual(jsonutils.dumps(body), err)
 
     def test_raw_request(self):
         fake_resp = utils.FakeResponse(
diff --git a/magnumclient/tests/test_utils.py b/magnumclient/tests/test_utils.py
index 93a96fe..831fea4 100644
--- a/magnumclient/tests/test_utils.py
+++ b/magnumclient/tests/test_utils.py
@@ -17,7 +17,7 @@
 
 import collections
 import mock
-from oslo_serialization import jsonutils as json
+from oslo_serialization import jsonutils
 import six
 import six.moves.builtins as __builtin__
 import tempfile
@@ -123,7 +123,7 @@ class FormatLabelsTest(test_utils.BaseTestCase):
         self.assertEqual({}, utils.format_labels(None))
 
     def test_format_labels(self):
-        l = utils.format_labels([
+        la = utils.format_labels([
             'K1=V1,K2=V2,'
             'K3=V3,K4=V4,'
             'K5=V5'])
@@ -132,10 +132,10 @@ class FormatLabelsTest(test_utils.BaseTestCase):
                           'K3': 'V3',
                           'K4': 'V4',
                           'K5': 'V5'
-                          }, l)
+                          }, la)
 
     def test_format_labels_semicolon(self):
-        l = utils.format_labels([
+        la = utils.format_labels([
             'K1=V1;K2=V2;'
             'K3=V3;K4=V4;'
             'K5=V5'])
@@ -144,10 +144,10 @@ class FormatLabelsTest(test_utils.BaseTestCase):
                           'K3': 'V3',
                           'K4': 'V4',
                           'K5': 'V5'
-                          }, l)
+                          }, la)
 
     def test_format_labels_mix_commas_semicolon(self):
-        l = utils.format_labels([
+        la = utils.format_labels([
             'K1=V1,K2=V2,'
             'K3=V3;K4=V4,'
             'K5=V5'])
@@ -156,10 +156,10 @@ class FormatLabelsTest(test_utils.BaseTestCase):
                           'K3': 'V3',
                           'K4': 'V4',
                           'K5': 'V5'
-                          }, l)
+                          }, la)
 
     def test_format_labels_split(self):
-        l = utils.format_labels([
+        la = utils.format_labels([
             'K1=V1,'
             'K2=V22222222222222222222222222222'
             '222222222222222222222222222,'
@@ -167,10 +167,10 @@ class FormatLabelsTest(test_utils.BaseTestCase):
         self.assertEqual({'K1': 'V1',
                           'K2': 'V22222222222222222222222222222'
                           '222222222222222222222222222',
-                          'K3': '3.3.3.3'}, l)
+                          'K3': '3.3.3.3'}, la)
 
     def test_format_labels_multiple(self):
-        l = utils.format_labels([
+        la = utils.format_labels([
             'K1=V1',
             'K2=V22222222222222222222222222222'
             '222222222222222222222222222',
@@ -178,35 +178,35 @@ class FormatLabelsTest(test_utils.BaseTestCase):
         self.assertEqual({'K1': 'V1',
                           'K2': 'V22222222222222222222222222222'
                           '222222222222222222222222222',
-                          'K3': '3.3.3.3'}, l)
+                          'K3': '3.3.3.3'}, la)
 
     def test_format_labels_multiple_colon_values(self):
-        l = utils.format_labels([
+        la = utils.format_labels([
             'K1=V1',
             'K2=V2,V22,V222,V2222',
             'K3=3.3.3.3'])
         self.assertEqual({'K1': 'V1',
                           'K2': 'V2,V22,V222,V2222',
-                          'K3': '3.3.3.3'}, l)
+                          'K3': '3.3.3.3'}, la)
 
     def test_format_labels_parse_comma_false(self):
-        l = utils.format_labels(
+        la = utils.format_labels(
             ['K1=V1,K2=2.2.2.2,K=V'],
             parse_comma=False)
-        self.assertEqual({'K1': 'V1,K2=2.2.2.2,K=V'}, l)
+        self.assertEqual({'K1': 'V1,K2=2.2.2.2,K=V'}, la)
 
     def test_format_labels_multiple_values_per_labels(self):
-        l = utils.format_labels([
+        la = utils.format_labels([
             'K1=V1',
             'K1=V2'])
-        self.assertEqual({'K1': 'V1,V2'}, l)
+        self.assertEqual({'K1': 'V1,V2'}, la)
 
     def test_format_label_special_label(self):
         labels = ['K1=V1,K22.2.2.2']
-        l = utils.format_labels(
+        la = utils.format_labels(
             labels,
             parse_comma=True)
-        self.assertEqual({'K1': 'V1,K22.2.2.2'}, l)
+        self.assertEqual({'K1': 'V1,K22.2.2.2'}, la)
 
     def test_format_multiple_bad_label(self):
         labels = ['K1=V1', 'K22.2.2.2']
@@ -261,7 +261,7 @@ class HandleJsonFromFileTest(test_utils.BaseTestCase):
             f.flush()
             steps = utils.handle_json_from_file(f.name)
 
-        self.assertEqual(json.loads(contents), steps)
+        self.assertEqual(jsonutils.loads(contents), steps)
 
     @mock.patch.object(__builtin__, 'open', autospec=True)
     def test_handle_json_from_file_open_fail(self, mock_open):
diff --git a/magnumclient/tests/utils.py b/magnumclient/tests/utils.py
index c155ae0..1562671 100644
--- a/magnumclient/tests/utils.py
+++ b/magnumclient/tests/utils.py
@@ -15,8 +15,8 @@
 
 import copy
 import datetime
-import json as jsonlib
 import os
+from oslo_serialization import jsonutils
 import sys
 
 import fixtures
@@ -95,7 +95,7 @@ class FakeResponse(object):
         self.reason = reason
 
     def __getitem__(self, key):
-        if key is 'location':
+        if key == 'location':
             return 'fake_url'
         else:
             return None
@@ -182,7 +182,7 @@ class FakeSessionResponse(object):
 
     def json(self):
         if self.content is not None:
-            return jsonlib.loads(self.content)
+            return jsonutils.loads(self.content)
         else:
             return {}
 
diff --git a/magnumclient/tests/v1/shell_test_base.py b/magnumclient/tests/v1/shell_test_base.py
index 89f6195..b165298 100644
--- a/magnumclient/tests/v1/shell_test_base.py
+++ b/magnumclient/tests/v1/shell_test_base.py
@@ -28,56 +28,56 @@ FAKE_ENV = {'OS_USERNAME': 'username',
 
 class TestCommandLineArgument(utils.TestCase):
     _unrecognized_arg_error = [
-        '.*?^usage: ',
-        '.*?^error: unrecognized arguments:',
-        ".*?^Try 'magnum help ' for more information.",
+        r'.*?^usage: ',
+        r'.*?^error: unrecognized arguments:',
+        r".*?^Try 'magnum help ' for more information.",
         ]
 
     _mandatory_group_arg_error = [
-        '.*?^usage: ',
-        '.*?^error: one of the arguments',
-        ".*?^Try 'magnum help ",
+        r'.*?^usage: ',
+        r'.*?^error: one of the arguments',
+        r".*?^Try 'magnum help ",
     ]
 
     _too_many_group_arg_error = [
-        '.*?^usage: ',
-        '.*?^error: (argument \-\-[a-z\-]*: not allowed with argument )',
-        ".*?^Try 'magnum help ",
+        r'.*?^usage: ',
+        r'.*?^error: (argument \-\-[a-z\-]*: not allowed with argument )',
+        r".*?^Try 'magnum help ",
     ]
 
     _mandatory_arg_error = [
-        '.*?^usage: ',
-        '.*?^error: (the following arguments|argument)',
-        ".*?^Try 'magnum help ",
-        ]
+        r'.*?^usage: ',
+        r'.*?^error: (the following arguments|argument)',
+        r".*?^Try 'magnum help ",
+    ]
 
     _duplicate_arg_error = [
-        '.*?^usage: ',
-        '.*?^error: (Duplicate "<.*>" arguments:)',
-        ".*?^Try 'magnum help ",
-        ]
+        r'.*?^usage: ',
+        r'.*?^error: (Duplicate "<.*>" arguments:)',
+        r".*?^Try 'magnum help ",
+    ]
 
     _deprecated_warning = [
-        '.*(WARNING: The \-\-[a-z\-]* parameter is deprecated)+',
-        ('.*(Use the [\<\-a-z\-\>]* (positional )*parameter to avoid seeing '
+        r'.*(WARNING: The \-\-[a-z\-]* parameter is deprecated)+',
+        (r'.*(Use the [\<\-a-z\-\>]* (positional )*parameter to avoid seeing '
          'this message)+')
     ]
 
     _few_argument_error = [
-        '.*?^usage: magnum ',
-        '.*?^error: (the following arguments|too few arguments)',
-        ".*?^Try 'magnum help ",
-        ]
+        r'.*?^usage: magnum ',
+        r'.*?^error: (the following arguments|too few arguments)',
+        r".*?^Try 'magnum help ",
+    ]
 
     _invalid_value_error = [
-        '.*?^usage: ',
-        '.*?^error: argument .*: invalid .* value:',
-        ".*?^Try 'magnum help ",
-        ]
+        r'.*?^usage: ',
+        r'.*?^error: argument .*: invalid .* value:',
+        r".*?^Try 'magnum help ",
+    ]
 
     _bay_status_error = [
-        '.*?^Bay status for',
-        ]
+        r'.*?^Bay status for',
+    ]
 
     def setUp(self):
         super(TestCommandLineArgument, self).setUp()
diff --git a/magnumclient/tests/v1/test_bays_shell.py b/magnumclient/tests/v1/test_bays_shell.py
index e9a3a47..60f512f 100644
--- a/magnumclient/tests/v1/test_bays_shell.py
+++ b/magnumclient/tests/v1/test_bays_shell.py
@@ -329,15 +329,6 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
         self._test_arg_success('bay-config --dir /tmp --force xxx')
         mock_bay.assert_called_with('xxx')
 
-    @mock.patch('magnumclient.v1.baymodels.BayModelManager.get')
-    @mock.patch('magnumclient.v1.bays.BayManager.get')
-    def test_bay_config_failure_wrong_status(self, mock_bay, mock_baymodel):
-        mock_bay.return_value = FakeBay(status='CREATE_IN_PROGRESS')
-        self.assertRaises(exceptions.CommandError,
-                          self._test_arg_failure,
-                          'bay-config xxx',
-                          ['.*?^Bay in status: '])
-
     @mock.patch('magnumclient.v1.bays.BayManager.get')
     def test_bay_config_failure_no_arg(self, mock_bay):
         self._test_arg_failure('bay-config', self._few_argument_error)
diff --git a/magnumclient/tests/v1/test_clusters.py b/magnumclient/tests/v1/test_clusters.py
index dc1a100..ee47fc0 100644
--- a/magnumclient/tests/v1/test_clusters.py
+++ b/magnumclient/tests/v1/test_clusters.py
@@ -54,6 +54,14 @@ UPDATED_CLUSTER = copy.deepcopy(CLUSTER1)
 NEW_NAME = 'newcluster'
 UPDATED_CLUSTER['name'] = NEW_NAME
 
+RESIZED_CLUSTER = copy.deepcopy(CLUSTER1)
+RESIZED_NODE_COUNT = 5
+UPDATED_CLUSTER['node_count'] = RESIZED_NODE_COUNT
+
+UPGRADED_CLUSTER = copy.deepcopy(CLUSTER1)
+UPGRADED_TO_TEMPLATE = "eabbc463-0d3f-49dc-8519-cb6b59507bd6"
+UPGRADED_CLUSTER['cluster_template_id'] = UPGRADED_TO_TEMPLATE
+
 fake_responses = {
     '/v1/clusters':
     {
@@ -145,6 +153,20 @@ fake_responses = {
             {'clusters': [CLUSTER2, CLUSTER1]},
         ),
     },
+    '/v1/clusters/%s/actions/resize' % CLUSTER1['uuid']:
+    {
+        'POST': (
+            {},
+            UPDATED_CLUSTER
+        ),
+    },
+    '/v1/clusters/%s/actions/upgrade' % CLUSTER1['uuid']:
+    {
+        'POST': (
+            {},
+            UPGRADED_CLUSTER
+        ),
+    }
 }
 
 
@@ -355,3 +377,24 @@ class ClusterManagerTest(testtools.TestCase):
         ]
         self.assertEqual(expect, self.api.calls)
         self.assertEqual(NEW_NAME, cluster.name)
+
+    def test_cluster_resize(self):
+        body = {'node_count': RESIZED_NODE_COUNT}
+        cluster = self.mgr.resize(CLUSTER1["uuid"], **body)
+        expect = [
+            ('POST', '/v1/clusters/%s/actions/resize' % CLUSTER1['uuid'],
+             {}, body),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(RESIZED_NODE_COUNT, cluster.node_count)
+
+    def test_cluster_upgrade(self):
+        body = {'cluster_template': UPGRADED_TO_TEMPLATE,
+                'max_batch_size': 1}
+        cluster = self.mgr.upgrade(CLUSTER1["uuid"], **body)
+        expect = [
+            ('POST', '/v1/clusters/%s/actions/upgrade' % CLUSTER1['uuid'],
+             {}, body),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(UPGRADED_TO_TEMPLATE, cluster.cluster_template_id)
diff --git a/magnumclient/tests/v1/test_clusters_shell.py b/magnumclient/tests/v1/test_clusters_shell.py
index 244132c..43d81d1 100644
--- a/magnumclient/tests/v1/test_clusters_shell.py
+++ b/magnumclient/tests/v1/test_clusters_shell.py
@@ -447,17 +447,6 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
         self._test_arg_success('cluster-config --dir /tmp --force xxx')
         mock_cluster.assert_called_with('xxx')
 
-    @mock.patch('magnumclient.v1.cluster_templates.ClusterTemplateManager.get')
-    @mock.patch('magnumclient.v1.clusters.ClusterManager.get')
-    def test_cluster_config_failure_wrong_status(self,
-                                                 mock_cluster,
-                                                 mock_clustertemplate):
-        mock_cluster.return_value = FakeCluster(status='CREATE_IN_PROGRESS')
-        self.assertRaises(exceptions.CommandError,
-                          self._test_arg_failure,
-                          'cluster-config xxx',
-                          ['.*?^Cluster in status: '])
-
     @mock.patch('magnumclient.v1.clusters.ClusterManager.get')
     def test_cluster_config_failure_no_arg(self, mock_cluster):
         self._test_arg_failure('cluster-config', self._few_argument_error)
diff --git a/magnumclient/tests/v1/test_clustertemplates.py b/magnumclient/tests/v1/test_clustertemplates.py
index 0471b1a..2beb78e 100644
--- a/magnumclient/tests/v1/test_clustertemplates.py
+++ b/magnumclient/tests/v1/test_clustertemplates.py
@@ -46,7 +46,8 @@ CLUSTERTEMPLATE1 = {
     'public': False,
     'registry_enabled': False,
     'master_lb_enabled': True,
-    'floating_ip_enabled': True
+    'floating_ip_enabled': True,
+    'hidden': False
     }
 
 CLUSTERTEMPLATE2 = {
@@ -309,6 +310,8 @@ class ClusterTemplateManagerTest(testtools.TestCase):
                          cluster_template.master_lb_enabled)
         self.assertEqual(CLUSTERTEMPLATE1['floating_ip_enabled'],
                          cluster_template.floating_ip_enabled)
+        self.assertEqual(CLUSTERTEMPLATE1['hidden'],
+                         cluster_template.hidden)
 
     def test_clustertemplate_show_by_name(self):
         cluster_template = self.mgr.get(CLUSTERTEMPLATE1['name'])
@@ -355,6 +358,8 @@ class ClusterTemplateManagerTest(testtools.TestCase):
                          cluster_template.master_lb_enabled)
         self.assertEqual(CLUSTERTEMPLATE1['floating_ip_enabled'],
                          cluster_template.floating_ip_enabled)
+        self.assertEqual(CLUSTERTEMPLATE1['hidden'],
+                         cluster_template.hidden)
 
     def test_clustertemplate_create(self):
         cluster_template = self.mgr.create(**CREATE_CLUSTERTEMPLATE)
diff --git a/magnumclient/tests/v1/test_clustertemplates_shell.py b/magnumclient/tests/v1/test_clustertemplates_shell.py
index 67bce87..ca17a4a 100644
--- a/magnumclient/tests/v1/test_clustertemplates_shell.py
+++ b/magnumclient/tests/v1/test_clustertemplates_shell.py
@@ -32,6 +32,7 @@ class FakeClusterTemplate(ClusterTemplate):
         self.coe = kwargs.get('coe', 'x')
         self.public = kwargs.get('public', False)
         self.name = kwargs.get('name', 'x')
+        self.hidden = kwargs.get('hidden', False)
 
 
 class ShellTest(shell_test_base.TestCommandLineArgument):
@@ -58,7 +59,7 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
                            tls_disabled=False, public=False,
                            master_lb_enabled=False, server_type='vm',
                            registry_enabled=False,
-                           insecure_registry=None):
+                           insecure_registry=None, hidden=False):
 
         expected_args = {}
         expected_args['image_id'] = image_id
@@ -85,6 +86,7 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
         expected_args['server_type'] = server_type
         expected_args['registry_enabled'] = registry_enabled
         expected_args['insecure_registry'] = insecure_registry
+        expected_args['hidden'] = hidden
 
         return expected_args
 
diff --git a/magnumclient/tests/v1/test_nodegroups.py b/magnumclient/tests/v1/test_nodegroups.py
new file mode 100644
index 0000000..40cbcf6
--- /dev/null
+++ b/magnumclient/tests/v1/test_nodegroups.py
@@ -0,0 +1,333 @@
+# Copyright (c) 2018 European Organization for Nuclear Research.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import copy
+
+import testtools
+from testtools import matchers
+
+from magnumclient import exceptions
+from magnumclient.tests import utils
+from magnumclient.v1 import nodegroups
+
+
+NODEGROUP1 = {
+    'id': 123,
+    'uuid': '66666666-7777-8888-9999-000000000001',
+    'cluster_id': '66666666-7777-8888-9999-000000000000',
+    'name': 'test-worker',
+    'node_addresses': ['172.17.2.3'],
+    'node_count': 2,
+    'project_id': 'fake_project',
+    'labels': {},
+    'flavor_id': 'fake_flavor_1',
+    'image_id': 'fake_image',
+    'is_default': True,
+    'role': 'worker',
+    'max_node_count': 10,
+    'min_node_count': 1
+}
+NODEGROUP2 = {
+    'id': 124,
+    'uuid': '66666666-7777-8888-9999-000000000002',
+    'cluster_id': '66666666-7777-8888-9999-000000000000',
+    'name': 'test-master',
+    'node_addresses': ['172.17.2.4'],
+    'node_count': 2,
+    'project_id': 'fake_project',
+    'labels': {},
+    'flavor_id': 'fake_flavor_1',
+    'image_id': 'fake_image',
+    'is_default': True,
+    'role': 'master',
+    'max_node_count': 10,
+    'min_node_count': 1
+}
+
+CREATE_NODEGROUP = copy.deepcopy(NODEGROUP1)
+del CREATE_NODEGROUP['id']
+del CREATE_NODEGROUP['uuid']
+del CREATE_NODEGROUP['node_addresses']
+del CREATE_NODEGROUP['is_default']
+del CREATE_NODEGROUP['cluster_id']
+
+UPDATED_NODEGROUP = copy.deepcopy(NODEGROUP1)
+NEW_NODE_COUNT = 9
+UPDATED_NODEGROUP['node_count'] = NEW_NODE_COUNT
+
+
+fake_responses = {
+    '/v1/clusters/test/nodegroups/':
+    {
+        'GET': (
+            {},
+            {'nodegroups': [NODEGROUP1, NODEGROUP2]},
+        ),
+        'POST': (
+            {},
+            CREATE_NODEGROUP,
+        ),
+    },
+    '/v1/clusters/test/nodegroups/%s' % NODEGROUP1['id']:
+    {
+        'GET': (
+            {},
+            NODEGROUP1
+        ),
+        'DELETE': (
+            {},
+            None,
+        ),
+        'PATCH': (
+            {},
+            UPDATED_NODEGROUP,
+        ),
+    },
+    '/v1/clusters/test/nodegroups/%s/?rollback=True' % NODEGROUP1['id']:
+        {
+            'PATCH': (
+                {},
+                UPDATED_NODEGROUP,
+            ),
+        },
+    '/v1/clusters/test/nodegroups/%s' % NODEGROUP1['name']:
+    {
+        'GET': (
+            {},
+            NODEGROUP1
+        ),
+        'DELETE': (
+            {},
+            None,
+        ),
+        'PATCH': (
+            {},
+            UPDATED_NODEGROUP,
+        ),
+    },
+    '/v1/clusters/test/nodegroups/?limit=2':
+    {
+        'GET': (
+            {},
+            {'nodegroups': [NODEGROUP1, NODEGROUP2]},
+        ),
+    },
+    '/v1/clusters/test/nodegroups/?marker=%s' % NODEGROUP2['uuid']:
+    {
+        'GET': (
+            {},
+            {'nodegroups': [NODEGROUP1, NODEGROUP2]},
+        ),
+    },
+    '/v1/clusters/test/nodegroups/?limit=2&marker=%s' % NODEGROUP2['uuid']:
+    {
+        'GET': (
+            {},
+            {'nodegroups': [NODEGROUP1, NODEGROUP2]},
+        ),
+    },
+    '/v1/clusters/test/nodegroups/?sort_dir=asc':
+    {
+        'GET': (
+            {},
+            {'nodegroups': [NODEGROUP1, NODEGROUP2]},
+        ),
+    },
+    '/v1/clusters/test/nodegroups/?sort_key=uuid':
+    {
+        'GET': (
+            {},
+            {'nodegroups': [NODEGROUP1, NODEGROUP2]},
+        ),
+    },
+    '/v1/clusters/test/nodegroups/?sort_key=uuid&sort_dir=desc':
+    {
+        'GET': (
+            {},
+            {'nodegroups': [NODEGROUP2, NODEGROUP1]},
+        ),
+    },
+}
+
+
+class NodeGroupManagerTest(testtools.TestCase):
+
+    def setUp(self):
+        super(NodeGroupManagerTest, self).setUp()
+        self.api = utils.FakeAPI(fake_responses)
+        self.mgr = nodegroups.NodeGroupManager(self.api)
+        self.cluster_id = 'test'
+        self.base_path = '/v1/clusters/test/nodegroups/'
+
+    def test_nodegroup_list(self):
+        clusters = self.mgr.list(self.cluster_id)
+        expect = [
+            ('GET', self.base_path, {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertThat(clusters, matchers.HasLength(2))
+
+    def _test_nodegroup_list_with_filters(self, cluster_id, limit=None,
+                                          marker=None, sort_key=None,
+                                          sort_dir=None, detail=False,
+                                          expect=[]):
+        nodegroup_filter = self.mgr.list(cluster_id,
+                                         limit=limit,
+                                         marker=marker,
+                                         sort_key=sort_key,
+                                         sort_dir=sort_dir,
+                                         detail=detail)
+        self.assertEqual(expect, self.api.calls)
+        self.assertThat(nodegroup_filter, matchers.HasLength(2))
+
+    def test_nodegroup_list_with_limit(self):
+        expect = [
+            ('GET', self.base_path + '?limit=2', {}, None),
+        ]
+        self._test_nodegroup_list_with_filters(
+            self.cluster_id,
+            limit=2,
+            expect=expect)
+
+    def test_nodegroup_list_with_marker(self):
+        filter_ = '?marker=%s' % NODEGROUP2['uuid']
+        expect = [
+            ('GET', self.base_path + filter_, {}, None),
+        ]
+        self._test_nodegroup_list_with_filters(
+            self.cluster_id,
+            marker=NODEGROUP2['uuid'],
+            expect=expect)
+
+    def test_nodegroup_list_with_marker_limit(self):
+        filter_ = '?limit=2&marker=%s' % NODEGROUP2['uuid']
+        expect = [
+            ('GET', self.base_path + filter_, {}, None),
+        ]
+        self._test_nodegroup_list_with_filters(
+            self.cluster_id,
+            limit=2, marker=NODEGROUP2['uuid'],
+            expect=expect)
+
+    def test_nodegroup_list_with_sort_dir(self):
+        expect = [
+            ('GET', '/v1/clusters/test/nodegroups/?sort_dir=asc', {}, None),
+        ]
+        self._test_nodegroup_list_with_filters(
+            self.cluster_id,
+            sort_dir='asc',
+            expect=expect)
+
+    def test_nodegroup_list_with_sort_key(self):
+        expect = [
+            ('GET', '/v1/clusters/test/nodegroups/?sort_key=uuid', {}, None),
+        ]
+        self._test_nodegroup_list_with_filters(
+            self.cluster_id,
+            sort_key='uuid',
+            expect=expect)
+
+    def test_nodegroup_list_with_sort_key_dir(self):
+        expect = [
+            ('GET', self.base_path + '?sort_key=uuid&sort_dir=desc', {}, None),
+        ]
+        self._test_nodegroup_list_with_filters(
+            self.cluster_id,
+            sort_key='uuid', sort_dir='desc',
+            expect=expect)
+
+    def test_nodegroup_show_by_name(self):
+        nodegroup = self.mgr.get(self.cluster_id, NODEGROUP1['name'])
+        expect = [
+            ('GET', self.base_path + '%s' % NODEGROUP1['name'], {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(NODEGROUP1['name'], nodegroup.name)
+
+    def test_nodegroup_show_by_id(self):
+        nodegroup = self.mgr.get(self.cluster_id, NODEGROUP1['id'])
+        expect = [
+            ('GET', self.base_path + '%s' % NODEGROUP1['id'], {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(NODEGROUP1['name'], nodegroup.name)
+
+    def test_nodegroup_delete_by_id(self):
+        nodegroup = self.mgr.delete(self.cluster_id, NODEGROUP1['id'])
+        expect = [
+            ('DELETE', self.base_path + '%s' % NODEGROUP1['id'], {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertIsNone(nodegroup)
+
+    def test_nodegroup_delete_by_name(self):
+        nodegroup = self.mgr.delete(self.cluster_id, NODEGROUP1['name'])
+        expect = [
+            ('DELETE', self.base_path + '%s' % NODEGROUP1['name'], {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertIsNone(nodegroup)
+
+    def test_nodegroup_update(self):
+        patch = {'op': 'replace',
+                 'value': NEW_NODE_COUNT,
+                 'path': '/node_count'}
+        nodegroup = self.mgr.update(self.cluster_id, id=NODEGROUP1['id'],
+                                    patch=patch)
+        expect = [
+            ('PATCH', self.base_path + '%s' % NODEGROUP1['id'], {}, patch),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(NEW_NODE_COUNT, nodegroup.node_count)
+
+    def test_nodegroup_create(self):
+        nodegroup = self.mgr.create(self.cluster_id, **CREATE_NODEGROUP)
+        expect = [
+            ('POST', self.base_path, {}, CREATE_NODEGROUP),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertTrue(nodegroup)
+
+    def test_nodegroup_create_with_docker_volume_size(self):
+        ng_with_volume_size = dict()
+        ng_with_volume_size.update(CREATE_NODEGROUP)
+        ng_with_volume_size['docker_volume_size'] = 20
+        nodegroup = self.mgr.create(self.cluster_id, **ng_with_volume_size)
+        expect = [
+            ('POST', self.base_path, {}, ng_with_volume_size),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertTrue(nodegroup)
+
+    def test_nodegroup_create_with_labels(self):
+        ng_with_labels = dict()
+        ng_with_labels.update(CREATE_NODEGROUP)
+        ng_with_labels['labels'] = "key=val"
+        nodegroup = self.mgr.create(self.cluster_id, **ng_with_labels)
+        expect = [
+            ('POST', self.base_path, {}, ng_with_labels),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertTrue(nodegroup)
+
+    def test_nodegroup_create_fail(self):
+        CREATE_NODEGROUP_FAIL = copy.deepcopy(CREATE_NODEGROUP)
+        CREATE_NODEGROUP_FAIL["wrong_key"] = "wrong"
+        self.assertRaisesRegex(exceptions.InvalidAttribute,
+                               ("Key must be in %s" %
+                                ','.join(nodegroups.CREATION_ATTRIBUTES)),
+                               self.mgr.create, self.cluster_id,
+                               **CREATE_NODEGROUP_FAIL)
+        self.assertEqual([], self.api.calls)
diff --git a/magnumclient/v1/basemodels.py b/magnumclient/v1/basemodels.py
index 0334b89..6ba0be9 100644
--- a/magnumclient/v1/basemodels.py
+++ b/magnumclient/v1/basemodels.py
@@ -22,7 +22,7 @@ CREATION_ATTRIBUTES = ['name', 'image_id', 'flavor_id', 'master_flavor_id',
                        'no_proxy', 'network_driver', 'tls_disabled', 'public',
                        'registry_enabled', 'volume_driver', 'server_type',
                        'docker_storage_driver', 'master_lb_enabled',
-                       'floating_ip_enabled']
+                       'floating_ip_enabled', 'hidden']
 
 OUTPUT_ATTRIBUTES = CREATION_ATTRIBUTES + ['apiserver_port', 'created_at',
                                            'insecure_registry', 'links',
diff --git a/magnumclient/v1/bays_shell.py b/magnumclient/v1/bays_shell.py
index 689e84f..d2c865f 100644
--- a/magnumclient/v1/bays_shell.py
+++ b/magnumclient/v1/bays_shell.py
@@ -228,8 +228,8 @@ def do_bay_config(cs, args):
     """
     args.dir = os.path.abspath(args.dir)
     bay = cs.bays.get(args.bay)
-    if bay.status not in ('CREATE_COMPLETE', 'UPDATE_COMPLETE'):
-        raise exceptions.CommandError("Bay in status %s" % bay.status)
+    if (hasattr(bay, 'api_address') and bay.api_address is None):
+        print("WARNING: The bay's api_address is not known yet.")
     baymodel = cs.baymodels.get(bay.baymodel_id)
     opts = {
         'cluster_uuid': bay.uuid,
diff --git a/magnumclient/v1/client.py b/magnumclient/v1/client.py
index 8a8c72e..cb98cf9 100644
--- a/magnumclient/v1/client.py
+++ b/magnumclient/v1/client.py
@@ -25,6 +25,7 @@ from magnumclient.v1 import certificates
 from magnumclient.v1 import cluster_templates
 from magnumclient.v1 import clusters
 from magnumclient.v1 import mservices
+from magnumclient.v1 import nodegroups
 from magnumclient.v1 import quotas
 from magnumclient.v1 import stats
 
@@ -215,3 +216,4 @@ class Client(object):
             profiler.init(profile)
         self.stats = stats.StatsManager(self.http_client)
         self.quotas = quotas.QuotasManager(self.http_client)
+        self.nodegroups = nodegroups.NodeGroupManager(self.http_client)
diff --git a/magnumclient/v1/cluster_templates_shell.py b/magnumclient/v1/cluster_templates_shell.py
index 32a1aa5..11f8d12 100644
--- a/magnumclient/v1/cluster_templates_shell.py
+++ b/magnumclient/v1/cluster_templates_shell.py
@@ -187,6 +187,13 @@ def _show_cluster_template(cluster_template):
 @utils.arg('--insecure-registry',
            metavar='<insecure-registry>',
            help='url of docker registry')
[e-mail]('--hidden',
+           action='store_true', default=False,
+           help=_('Make cluster template hidden.'))
[e-mail]('--visible',
+           dest='hidden',
+           action='store_false',
+           help=_('Make cluster template visible.'))
 @utils.deprecated(utils.MAGNUM_CLIENT_DEPRECATION_WARNING)
 def do_cluster_template_create(cs, args):
     """Create a cluster template."""
@@ -219,6 +226,7 @@ def do_cluster_template_create(cs, args):
     opts['server_type'] = args.server_type
     opts['master_lb_enabled'] = args.master_lb_enabled
     opts['insecure_registry'] = args.insecure_registry
+    opts['hidden'] = args.hidden
 
     if len(args.floating_ip_enabled) > 1:
         raise InvalidAttribute('--floating-ip-enabled and '
diff --git a/magnumclient/v1/clusters.py b/magnumclient/v1/clusters.py
index cdb599a..6aabc4b 100644
--- a/magnumclient/v1/clusters.py
+++ b/magnumclient/v1/clusters.py
@@ -23,6 +23,10 @@ CREATION_ATTRIBUTES.append('docker_volume_size')
 CREATION_ATTRIBUTES.append('labels')
 CREATION_ATTRIBUTES.append('master_flavor_id')
 CREATION_ATTRIBUTES.append('flavor_id')
+CREATION_ATTRIBUTES.append('fixed_network')
+CREATION_ATTRIBUTES.append('fixed_subnet')
+CREATION_ATTRIBUTES.append('floating_ip_enabled')
+CREATION_ATTRIBUTES.append('merge_labels')
 
 
 class Cluster(baseunit.BaseTemplate):
@@ -32,3 +36,33 @@ class Cluster(baseunit.BaseTemplate):
 class ClusterManager(baseunit.BaseTemplateManager):
     resource_class = Cluster
     template_name = 'clusters'
+
+    def resize(self, cluster_uuid, node_count,
+               nodes_to_remove=[], nodegroup=None):
+        url = self._path(cluster_uuid) + "/actions/resize"
+
+        post_body = {"node_count": node_count}
+        if nodes_to_remove:
+            post_body.update({"nodes_to_remove": nodes_to_remove})
+        if nodegroup:
+            post_body.update({"nodegroup": nodegroup})
+
+        resp, resp_body = self.api.json_request("POST", url, body=post_body)
+
+        if resp_body:
+            return self.resource_class(self, resp_body)
+
+    def upgrade(self, cluster_uuid, cluster_template,
+                max_batch_size=1, nodegroup=None):
+        url = self._path(cluster_uuid) + "/actions/upgrade"
+
+        post_body = {"cluster_template": cluster_template}
+        if max_batch_size:
+            post_body.update({"max_batch_size": max_batch_size})
+        if nodegroup:
+            post_body.update({"nodegroup": nodegroup})
+
+        resp, resp_body = self.api.json_request("POST", url, body=post_body)
+
+        if resp_body:
+            return self.resource_class(self, resp_body)
diff --git a/magnumclient/v1/clusters_shell.py b/magnumclient/v1/clusters_shell.py
index 81e77e7..e46b3f9 100644
--- a/magnumclient/v1/clusters_shell.py
+++ b/magnumclient/v1/clusters_shell.py
@@ -262,9 +262,8 @@ def do_cluster_config(cs, args):
     """
     args.dir = os.path.abspath(args.dir)
     cluster = cs.clusters.get(args.cluster)
-    if cluster.status not in ('CREATE_COMPLETE', 'UPDATE_COMPLETE',
-                              'ROLLBACK_COMPLETE'):
-        raise exceptions.CommandError("cluster in status %s" % cluster.status)
+    if (hasattr(cluster, 'api_address') and cluster.api_address is None):
+        print("WARNING: The cluster's api_address is not known yet.")
     cluster_template = cs.cluster_templates.get(cluster.cluster_template_id)
     opts = {
         'cluster_uuid': cluster.uuid,
diff --git a/magnumclient/v1/nodegroups.py b/magnumclient/v1/nodegroups.py
new file mode 100644
index 0000000..111d8fb
--- /dev/null
+++ b/magnumclient/v1/nodegroups.py
@@ -0,0 +1,84 @@
+# Copyright (c) 2018 European Organization for Nuclear Research.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from magnumclient.common import utils
+from magnumclient import exceptions
+from magnumclient.v1 import baseunit
+
+
+CREATION_ATTRIBUTES = ['docker_volume_size', 'labels', 'flavor_id', 'image_id',
+                       'project_id', 'node_count', 'name', 'role',
+                       'min_node_count', 'max_node_count', 'merge_labels']
+
+
+class NodeGroup(baseunit.BaseTemplate):
+    template_name = "NodeGroups"
+
+
+class NodeGroupManager(baseunit.BaseTemplateManager):
+    resource_class = NodeGroup
+    template_name = 'nodegroups'
+    api_name = 'nodegroups'
+
+    @classmethod
+    def _path(cls, cluster_id, id=None):
+        path = '/v1/clusters/%s/%s/' % (cluster_id, cls.template_name)
+        if id:
+            path += str(id)
+        return path
+
+    def list(self, cluster_id, limit=None, marker=None, sort_key=None,
+             sort_dir=None, role=None, detail=False):
+        if limit is not None:
+            limit = int(limit)
+
+        filters = utils.common_filters(marker, limit, sort_key, sort_dir)
+        path = ''
+        if role:
+            filters.append('role=%s' % role)
+        if detail:
+            path += 'detail'
+        if filters:
+            path += '?' + '&'.join(filters)
+
+        if limit is None:
+            return self._list(self._path(cluster_id, id=path),
+                              self.__class__.api_name)
+        else:
+            return self._list_pagination(self._path(cluster_id, id=path),
+                                         self.__class__.api_name,
+                                         limit=limit)
+
+    def get(self, cluster_id, id):
+        try:
+            return self._list(self._path(cluster_id, id=id))[0]
+        except IndexError:
+            return None
+
+    def create(self, cluster_id, **kwargs):
+        new = {}
+        for (key, value) in kwargs.items():
+            if key in CREATION_ATTRIBUTES:
+                new[key] = value
+            else:
+                raise exceptions.InvalidAttribute(
+                    "Key must be in %s" % ",".join(CREATION_ATTRIBUTES))
+        return self._create(self._path(cluster_id), new)
+
+    def delete(self, cluster_id, id):
+        return self._delete(self._path(cluster_id, id=id))
+
+    def update(self, cluster_id, id, patch):
+        return self._update(self._path(cluster_id, id=id), patch)
diff --git a/python_magnumclient.egg-info/PKG-INFO b/python_magnumclient.egg-info/PKG-INFO
new file mode 100644
index 0000000..8045ab2
--- /dev/null
+++ b/python_magnumclient.egg-info/PKG-INFO
@@ -0,0 +1,61 @@
+Metadata-Version: 1.1
+Name: python-magnumclient
+Version: 3.0.1
+Summary: Client library for Magnum API
+Home-page: https://docs.openstack.org/python-magnumclient/latest/
+Author: OpenStack
+Author-email: [e-mail]
+License: UNKNOWN
+Description: ========================
+        Team and repository tags
+        ========================
+        
+        .. image:: https://governance.openstack.org/tc/badges/python-magnumclient.svg
+            :target: https://governance.openstack.org/tc/reference/tags/index.html
+        
+        .. Change things from this point on
+        
+        Python bindings to the Magnum API
+        =================================
+        
+        .. image:: https://img.shields.io/pypi/v/python-magnumclient.svg
+            :target: https://pypi.org/project/python-magnumclient/
+            :alt: Latest Version
+        
+        .. image:: https://img.shields.io/pypi/dm/python-magnumclient.svg
+            :target: https://pypi.org/project/python-magnumclient/
+            :alt: Downloads
+        
+        This is a client library for Magnum built on the Magnum API. It
+        provides a Python API (the ``magnumclient`` module) and a command-line
+        tool (``magnum``).
+        
+        Development takes place via the usual OpenStack processes as outlined
+        in the `developer guide
+        <https://docs.openstack.org/infra/manual/developers.html>`_.
+        
+        * License: Apache License, Version 2.0
+        * `PyPi`_ - package installation
+        * `Online Documentation`_
+        * `Launchpad project`_ - release management
+        * `Bugs`_ - issue tracking
+        * `Source`_
+        
+        .. _PyPi: https://pypi.org/project/python-magnumclient
+        .. _Online Documentation: https://docs.openstack.org/python-magnumclient/latest/
+        .. _Launchpad project: https://launchpad.net/python-magnumclient
+        .. _Bugs: https://bugs.launchpad.net/python-magnumclient
+        .. _Source: https://opendev.org/openstack/python-magnumclient
+        
+        
+Platform: UNKNOWN
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
diff --git a/python_magnumclient.egg-info/SOURCES.txt b/python_magnumclient.egg-info/SOURCES.txt
new file mode 100644
index 0000000..c63c7ee
--- /dev/null
+++ b/python_magnumclient.egg-info/SOURCES.txt
@@ -0,0 +1,128 @@
+.coveragerc
+.mailmap
+.stestr.conf
+.zuul.yaml
+AUTHORS
+CONTRIBUTING.rst
+ChangeLog
+LICENSE
+README.rst
+babel.cfg
+lower-constraints.txt
+requirements.txt
+setup.cfg
+setup.py
+test-requirements.txt
+tox.ini
+doc/requirements.txt
+doc/source/conf.py
+doc/source/contributing.rst
+doc/source/index.rst
+doc/source/installation.rst
+doc/source/readme.rst
+doc/source/usage.rst
+magnumclient/__init__.py
+magnumclient/client.py
+magnumclient/exceptions.py
+magnumclient/i18n.py
+magnumclient/shell.py
+magnumclient/version.py
+magnumclient/common/__init__.py
+magnumclient/common/base.py
+magnumclient/common/cliutils.py
+magnumclient/common/httpclient.py
+magnumclient/common/utils.py
+magnumclient/common/apiclient/__init__.py
+magnumclient/common/apiclient/base.py
+magnumclient/common/apiclient/exceptions.py
+magnumclient/osc/__init__.py
+magnumclient/osc/plugin.py
+magnumclient/osc/v1/__init__.py
+magnumclient/osc/v1/certificates.py
+magnumclient/osc/v1/cluster_templates.py
+magnumclient/osc/v1/clusters.py
+magnumclient/osc/v1/mservices.py
+magnumclient/osc/v1/nodegroups.py
+magnumclient/osc/v1/quotas.py
+magnumclient/osc/v1/stats.py
+magnumclient/tests/__init__.py
+magnumclient/tests/base.py
+magnumclient/tests/test_client.py
+magnumclient/tests/test_httpclient.py
+magnumclient/tests/test_magnumclient.py
+magnumclient/tests/test_shell.py
+magnumclient/tests/test_utils.py
+magnumclient/tests/utils.py
+magnumclient/tests/osc/__init__.py
+magnumclient/tests/osc/unit/__init__.py
+magnumclient/tests/osc/unit/osc_fakes.py
+magnumclient/tests/osc/unit/osc_utils.py
+magnumclient/tests/osc/unit/v1/__init__.py
+magnumclient/tests/osc/unit/v1/fakes.py
+magnumclient/tests/osc/unit/v1/test_certificates.py
+magnumclient/tests/osc/unit/v1/test_cluster_templates.py
+magnumclient/tests/osc/unit/v1/test_clusters.py
+magnumclient/tests/osc/unit/v1/test_mservices.py
+magnumclient/tests/osc/unit/v1/test_nodegroups.py
+magnumclient/tests/osc/unit/v1/test_quotas.py
+magnumclient/tests/osc/unit/v1/test_stats.py
+magnumclient/tests/test_csr/test.csr
+magnumclient/tests/v1/__init__.py
+magnumclient/tests/v1/shell_test_base.py
+magnumclient/tests/v1/test_baymodels.py
+magnumclient/tests/v1/test_baymodels_shell.py
+magnumclient/tests/v1/test_bays.py
+magnumclient/tests/v1/test_bays_shell.py
+magnumclient/tests/v1/test_certificates.py
+magnumclient/tests/v1/test_certificates_shell.py
+magnumclient/tests/v1/test_client.py
+magnumclient/tests/v1/test_clusters.py
+magnumclient/tests/v1/test_clusters_shell.py
+magnumclient/tests/v1/test_clustertemplates.py
+magnumclient/tests/v1/test_clustertemplates_shell.py
+magnumclient/tests/v1/test_mservices.py
+magnumclient/tests/v1/test_mservices_shell.py
+magnumclient/tests/v1/test_nodegroups.py
+magnumclient/tests/v1/test_quotas.py
+magnumclient/tests/v1/test_quotas_shell.py
+magnumclient/tests/v1/test_stats.py
+magnumclient/tests/v1/test_stats_shell.py
+magnumclient/v1/__init__.py
+magnumclient/v1/basemodels.py
+magnumclient/v1/baseunit.py
+magnumclient/v1/baymodels.py
+magnumclient/v1/baymodels_shell.py
+magnumclient/v1/bays.py
+magnumclient/v1/bays_shell.py
+magnumclient/v1/certificates.py
+magnumclient/v1/certificates_shell.py
+magnumclient/v1/client.py
+magnumclient/v1/cluster_templates.py
+magnumclient/v1/cluster_templates_shell.py
+magnumclient/v1/clusters.py
+magnumclient/v1/clusters_shell.py
+magnumclient/v1/mservices.py
+magnumclient/v1/mservices_shell.py
+magnumclient/v1/nodegroups.py
+magnumclient/v1/quotas.py
+magnumclient/v1/quotas_shell.py
+magnumclient/v1/shell.py
+magnumclient/v1/stats.py
+magnumclient/v1/stats_shell.py
+python_magnumclient.egg-info/PKG-INFO
+python_magnumclient.egg-info/SOURCES.txt
+python_magnumclient.egg-info/dependency_links.txt
+python_magnumclient.egg-info/entry_points.txt
+python_magnumclient.egg-info/not-zip-safe
+python_magnumclient.egg-info/pbr.json
+python_magnumclient.egg-info/requires.txt
+python_magnumclient.egg-info/top_level.txt
+releasenotes/notes/partial_osc_implementation_for_certificate-4597c20b59c152e1.yaml
+releasenotes/notes/partial_osc_implementation_for_quotas-33f44c0496d721f8.yaml
+releasenotes/source/conf.py
+releasenotes/source/index.rst
+releasenotes/source/rocky.rst
+releasenotes/source/stein.rst
+releasenotes/source/train.rst
+releasenotes/source/unreleased.rst
+tools/magnum.bash_completion
\ No newline at end of file
diff --git a/python_magnumclient.egg-info/dependency_links.txt b/python_magnumclient.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/python_magnumclient.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/python_magnumclient.egg-info/entry_points.txt b/python_magnumclient.egg-info/entry_points.txt
new file mode 100644
index 0000000..ebade23
--- /dev/null
+++ b/python_magnumclient.egg-info/entry_points.txt
@@ -0,0 +1,36 @@
+[console_scripts]
+magnum = magnumclient.shell:main
+
+[openstack.cli.extension]
+container_infra = magnumclient.osc.plugin
+
+[openstack.container_infra.v1]
+coe_ca_rotate = magnumclient.osc.v1.certificates:RotateCa
+coe_ca_show = magnumclient.osc.v1.certificates:ShowCa
+coe_ca_sign = magnumclient.osc.v1.certificates:SignCa
+coe_cluster_config = magnumclient.osc.v1.clusters:ConfigCluster
+coe_cluster_create = magnumclient.osc.v1.clusters:CreateCluster
+coe_cluster_delete = magnumclient.osc.v1.clusters:DeleteCluster
+coe_cluster_list = magnumclient.osc.v1.clusters:ListCluster
+coe_cluster_resize = magnumclient.osc.v1.clusters:ResizeCluster
+coe_cluster_show = magnumclient.osc.v1.clusters:ShowCluster
+coe_cluster_template_create = magnumclient.osc.v1.cluster_templates:CreateClusterTemplate
+coe_cluster_template_delete = magnumclient.osc.v1.cluster_templates:DeleteClusterTemplate
+coe_cluster_template_list = magnumclient.osc.v1.cluster_templates:ListTemplateCluster
+coe_cluster_template_show = magnumclient.osc.v1.cluster_templates:ShowClusterTemplate
+coe_cluster_template_update = magnumclient.osc.v1.cluster_templates:UpdateClusterTemplate
+coe_cluster_update = magnumclient.osc.v1.clusters:UpdateCluster
+coe_cluster_upgrade = magnumclient.osc.v1.clusters:UpgradeCluster
+coe_nodegroup_create = magnumclient.osc.v1.nodegroups:CreateNodeGroup
+coe_nodegroup_delete = magnumclient.osc.v1.nodegroups:DeleteNodeGroup
+coe_nodegroup_list = magnumclient.osc.v1.nodegroups:ListNodeGroup
+coe_nodegroup_show = magnumclient.osc.v1.nodegroups:ShowNodeGroup
+coe_nodegroup_update = magnumclient.osc.v1.nodegroups:UpdateNodeGroup
+coe_quotas_create = magnumclient.osc.v1.quotas:CreateQuotas
+coe_quotas_delete = magnumclient.osc.v1.quotas:DeleteQuotas
+coe_quotas_list = magnumclient.osc.v1.quotas:ListQuotas
+coe_quotas_show = magnumclient.osc.v1.quotas:ShowQuotas
+coe_quotas_update = magnumclient.osc.v1.quotas:UpdateQuotas
+coe_service_list = magnumclient.osc.v1.mservices:ListService
+coe_stats_list = magnumclient.osc.v1.stats:ListStats
+
diff --git a/python_magnumclient.egg-info/not-zip-safe b/python_magnumclient.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/python_magnumclient.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/python_magnumclient.egg-info/pbr.json b/python_magnumclient.egg-info/pbr.json
new file mode 100644
index 0000000..b268641
--- /dev/null
+++ b/python_magnumclient.egg-info/pbr.json
@@ -0,0 +1 @@
+{"git_version": "6d1a386", "is_release": true}
\ No newline at end of file
diff --git a/python_magnumclient.egg-info/requires.txt b/python_magnumclient.egg-info/requires.txt
new file mode 100644
index 0000000..1a7483a
--- /dev/null
+++ b/python_magnumclient.egg-info/requires.txt
@@ -0,0 +1,15 @@
+Babel!=2.4.0,>=2.3.4
+PrettyTable<0.8,>=0.7.2
+cryptography>=2.1
+decorator>=3.4.0
+keystoneauth1>=3.4.0
+os-client-config>=1.28.0
+osc-lib>=1.8.0
+oslo.i18n>=3.15.3
+oslo.log>=3.36.0
+oslo.serialization!=2.19.1,>=2.18.0
+oslo.utils>=3.33.0
+pbr!=2.1.0,>=2.0.0
+requests>=2.14.2
+six>=1.10.0
+stevedore>=1.20.0
diff --git a/python_magnumclient.egg-info/top_level.txt b/python_magnumclient.egg-info/top_level.txt
new file mode 100644
index 0000000..66cb45a
--- /dev/null
+++ b/python_magnumclient.egg-info/top_level.txt
@@ -0,0 +1 @@
+magnumclient
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index 416280b..11d549e 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -6,6 +6,8 @@
    :maxdepth: 1
 
    unreleased
+   train
+   stein
    rocky
 
 OpenStack Releases
diff --git a/releasenotes/source/stein.rst b/releasenotes/source/stein.rst
new file mode 100644
index 0000000..efaceb6
--- /dev/null
+++ b/releasenotes/source/stein.rst
@@ -0,0 +1,6 @@
+===================================
+ Stein Series Release Notes
+===================================
+
+.. release-notes::
+   :branch: stable/stein
diff --git a/releasenotes/source/train.rst b/releasenotes/source/train.rst
new file mode 100644
index 0000000..5839003
--- /dev/null
+++ b/releasenotes/source/train.rst
@@ -0,0 +1,6 @@
+==========================
+Train Series Release Notes
+==========================
+
+.. release-notes::
+   :branch: stable/train
diff --git a/setup.cfg b/setup.cfg
index 4db9c44..05d064e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,59 +1,64 @@
 [metadata]
 name = python-magnumclient
 summary = Client library for Magnum API
-description-file =
-    README.rst
+description-file = 
+	README.rst
 author = OpenStack
-author-email = [e-mail]
+author-email = [e-mail]
 home-page = https://docs.openstack.org/python-magnumclient/latest/
-classifier =
-    Environment :: OpenStack
-    Intended Audience :: Information Technology
-    Intended Audience :: System Administrators
-    License :: OSI Approved :: Apache Software License
-    Operating System :: POSIX :: Linux
-    Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
+classifier = 
+	Environment :: OpenStack
+	Intended Audience :: Information Technology
+	Intended Audience :: System Administrators
+	License :: OSI Approved :: Apache Software License
+	Operating System :: POSIX :: Linux
+	Programming Language :: Python
+	Programming Language :: Python :: 2
+	Programming Language :: Python :: 3
+	Programming Language :: Python :: 3.6
+	Programming Language :: Python :: 3.7
 
 [files]
-packages =
-    magnumclient
+packages = 
+	magnumclient
 
 [entry_points]
-console_scripts =
-    magnum = magnumclient.shell:main
-
-openstack.cli.extension =
-    container_infra = magnumclient.osc.plugin
-
-openstack.container_infra.v1 =
-    coe_cluster_template_create = magnumclient.osc.v1.cluster_templates:CreateClusterTemplate
-    coe_cluster_template_delete = magnumclient.osc.v1.cluster_templates:DeleteClusterTemplate
-    coe_cluster_template_list = magnumclient.osc.v1.cluster_templates:ListTemplateCluster
-    coe_cluster_template_show = magnumclient.osc.v1.cluster_templates:ShowClusterTemplate
-    coe_cluster_template_update = magnumclient.osc.v1.cluster_templates:UpdateClusterTemplate
-
-    coe_cluster_create = magnumclient.osc.v1.clusters:CreateCluster
-    coe_cluster_list = magnumclient.osc.v1.clusters:ListCluster
-    coe_cluster_delete = magnumclient.osc.v1.clusters:DeleteCluster
-    coe_cluster_show = magnumclient.osc.v1.clusters:ShowCluster
-    coe_cluster_update = magnumclient.osc.v1.clusters:UpdateCluster
-    coe_cluster_config = magnumclient.osc.v1.clusters:ConfigCluster
-    coe_ca_rotate = magnumclient.osc.v1.certificates:RotateCa
-    coe_ca_show = magnumclient.osc.v1.certificates:ShowCa
-    coe_ca_sign = magnumclient.osc.v1.certificates:SignCa
-    coe_stats_list = magnumclient.osc.v1.stats:ListStats
-    coe_quotas_create = magnumclient.osc.v1.quotas:CreateQuotas
-    coe_quotas_delete = magnumclient.osc.v1.quotas:DeleteQuotas
-    coe_quotas_update = magnumclient.osc.v1.quotas:UpdateQuotas
-    coe_quotas_show = magnumclient.osc.v1.quotas:ShowQuotas
-    coe_quotas_list = magnumclient.osc.v1.quotas:ListQuotas
-
-    coe_service_list = magnumclient.osc.v1.mservices:ListService
-
+console_scripts = 
+	magnum = magnumclient.shell:main
+openstack.cli.extension = 
+	container_infra = magnumclient.osc.plugin
+openstack.container_infra.v1 = 
+	coe_cluster_template_create = magnumclient.osc.v1.cluster_templates:CreateClusterTemplate
+	coe_cluster_template_delete = magnumclient.osc.v1.cluster_templates:DeleteClusterTemplate
+	coe_cluster_template_list = magnumclient.osc.v1.cluster_templates:ListTemplateCluster
+	coe_cluster_template_show = magnumclient.osc.v1.cluster_templates:ShowClusterTemplate
+	coe_cluster_template_update = magnumclient.osc.v1.cluster_templates:UpdateClusterTemplate
+	
+	coe_cluster_create = magnumclient.osc.v1.clusters:CreateCluster
+	coe_cluster_list = magnumclient.osc.v1.clusters:ListCluster
+	coe_cluster_delete = magnumclient.osc.v1.clusters:DeleteCluster
+	coe_cluster_show = magnumclient.osc.v1.clusters:ShowCluster
+	coe_cluster_update = magnumclient.osc.v1.clusters:UpdateCluster
+	coe_cluster_config = magnumclient.osc.v1.clusters:ConfigCluster
+	coe_cluster_resize = magnumclient.osc.v1.clusters:ResizeCluster
+	coe_cluster_upgrade = magnumclient.osc.v1.clusters:UpgradeCluster
+	coe_ca_rotate = magnumclient.osc.v1.certificates:RotateCa
+	coe_ca_show = magnumclient.osc.v1.certificates:ShowCa
+	coe_ca_sign = magnumclient.osc.v1.certificates:SignCa
+	coe_stats_list = magnumclient.osc.v1.stats:ListStats
+	coe_quotas_create = magnumclient.osc.v1.quotas:CreateQuotas
+	coe_quotas_delete = magnumclient.osc.v1.quotas:DeleteQuotas
+	coe_quotas_update = magnumclient.osc.v1.quotas:UpdateQuotas
+	coe_quotas_show = magnumclient.osc.v1.quotas:ShowQuotas
+	coe_quotas_list = magnumclient.osc.v1.quotas:ListQuotas
+	
+	coe_service_list = magnumclient.osc.v1.mservices:ListService
+	
+	coe_nodegroup_list = magnumclient.osc.v1.nodegroups:ListNodeGroup
+	coe_nodegroup_show = magnumclient.osc.v1.nodegroups:ShowNodeGroup
+	coe_nodegroup_create = magnumclient.osc.v1.nodegroups:CreateNodeGroup
+	coe_nodegroup_delete = magnumclient.osc.v1.nodegroups:DeleteNodeGroup
+	coe_nodegroup_update = magnumclient.osc.v1.nodegroups:UpdateNodeGroup
 
 [compile_catalog]
 directory = magnumclient/locale
@@ -71,3 +76,8 @@ output_file = magnumclient/locale/magnumclient.pot
 
 [wheel]
 universal = 1
+
+[egg_info]
+tag_build = 
+tag_date = 0
+
diff --git a/test-requirements.txt b/test-requirements.txt
index f625855..fd61dfa 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,8 +1,8 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
-bandit>=1.1.0 # Apache-2.0
+hacking>=2.0,<2.1 # Apache-2.0
+bandit!=1.6.0,>=1.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 python-openstackclient>=3.12.0 # Apache-2.0
diff --git a/tools/cover.sh b/tools/cover.sh
deleted file mode 100755
index 74b25d9..0000000
--- a/tools/cover.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-ALLOWED_EXTRA_MISSING=0
-
-show_diff () {
-    head -1 $1
-    diff -U 0 $1 $2 | sed 1,2d
-}
-
-if ! git diff --exit-code || ! git diff --cached --exit-code
-then
-    echo "There are uncommitted changes!"
-    echo "Please clean git working directory and try again"
-    exit 1
-fi
-
-# Checkout master and save coverage report
-git checkout HEAD^
-
-baseline_report=$(mktemp -t magnumclient_coverageXXXXXXX)
-find . -type f -name "*.pyc" -delete
-stestr run "$*"
-coverage combine
-coverage report --fail-under=80 --skip-covered
-coverage html -d cover
-coverage xml -o cover/coverage.xml
-coverage report > $baseline_report
-mv cover cover-master
-cat $baseline_report
-baseline_missing=$(awk 'END { print $3 }' $baseline_report)
-
-# Checkout back and save coverage report
-git checkout -
-
-current_report=$(mktemp -t magnumclient_coverageXXXXXXX)
-find . -type f -name "*.pyc" -delete
-stestr run "$*"
-coverage combine
-coverage report --fail-under=80 --skip-covered
-coverage html -d cover
-coverage xml -o cover/coverage.xml
-coverage report > $current_report
-current_missing=$(awk 'END { print $3 }' $current_report)
-
-# Show coverage details
-allowed_missing=$((baseline_missing+ALLOWED_EXTRA_MISSING))
-
-echo "Allowed to introduce missing lines : ${ALLOWED_EXTRA_MISSING}"
-echo "Missing lines in master            : ${baseline_missing}"
-echo "Missing lines in proposed change   : ${current_missing}"
-
-if [ $allowed_missing -ge $current_missing ]; then
-    if [ $baseline_missing -lt $current_missing ]; then
-        show_diff $baseline_report $current_report
-        echo "We believe you can test your code with 100% coverage!"
-    else
-        echo "Thank you! You are awesome! Keep writing unit tests! :)"
-    fi
-    exit_code=0
-else
-    show_diff $baseline_report $current_report
-    echo "Please write more unit tests, we must maintain our test coverage :( "
-    exit_code=1
-fi
-
-rm $baseline_report $current_report
-exit $exit_code
diff --git a/tox.ini b/tox.ini
index 391d0f4..004dc2d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 1.6
-envlist = py35,py27,pypy,pep8
+minversion = 2.0
+envlist = py37,pypy,pep8
 skipsdist = True
 
 [testenv]
@@ -11,7 +11,7 @@ setenv =
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
 deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
@@ -21,14 +21,14 @@ commands =
 [testenv:bandit]
 basepython = python3
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
   -r{toxinidir}/test-requirements.txt
 commands = bandit -r magnumclient -x tests -n5 -ll
 
 [testenv:pypy]
 basepython = python3
 deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
        setuptools<3.2
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
@@ -37,14 +37,6 @@ deps =
 basepython = python3
 commands = oslo_debug_helper -t magnumclient/tests {posargs}
 
-[testenv:debug-py27]
-basepython = python2.7
-commands = oslo_debug_helper -t magnumclient/tests {posargs}
-
-[testenv:debug-py35]
-basepython = python3.5
-commands = oslo_debug_helper -t magnumclient/tests {posargs}
-
 [testenv:pep8]
 basepython = python3
 commands =
@@ -64,13 +56,20 @@ commands = {posargs}
 
 [testenv:cover]
 basepython = python3
-commands = {toxinidir}/tools/cover.sh {posargs}
+setenv =
+    PYTHON=coverage run --source magnumclient --parallel-mode
+commands =
+    stestr run {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
+    coverage report
 
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
 
 show-source = True
-ignore = E123,E125
+ignore = E123,E125,W503,W504
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,,*lib/python*,*egg,build
 
@@ -89,4 +88,4 @@ basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands =
   rm -rf releasenotes/build
-  sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
\ No newline at end of file
+  sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html