Merge lp:~andreserl/maas/maas_lp1553791_maas-region into lp:maas/trunk

[Andres Rodriguez]

Change references of maas-region-admin to maas-region

[Andres Rodriguez (andreserl)]

https://code.launchpad.net/~andreserl/maas/lp1553791/+merge/288296

[Blake Rouse (blake-rouse)]

Same as other reviews, looks good!

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~andreserl/maas/maas_lp1553791_maas-region into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://security.ubuntu.com/ubuntu xenial-security InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease [95.8 kB]
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Get:5 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe Sources [7,722 kB]
Get:6 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe amd64 Packages [7,367 kB]
Get:7 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe Translation-en [4,901 kB]
Fetched 20.1 MB in 5s (3,397 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-coverage python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-mock python3-netaddr python3-netifaces python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-1ubuntu1).
archdetect-deb is already the newest version (1.114ubuntu3).
authbind is already the newest version (2.1.1+nmu1).
bind9 is already the newest version (1:9.10.3.dfsg.P2-5).
bind9utils is already the newest version (1:9.10.3.dfsg.P2-5).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu2).
dh-apport is already the newest version (2.20-0ubuntu3).
dh-systemd is already the newest version (1.29ubuntu1).
distro-info is already the newest version (0.14build1).
dnsutils is already the newest version (1:9.10.3.dfsg.P2-5).
firefox is already the newest version (45.0+build2-0ubuntu1).
freeipmi-tools is already the newest version (1.4.11...

=== modified file 'HACKING.txt'
--- HACKING.txt	2016-03-07 15:16:47 +0000
+++ HACKING.txt	2016-03-07 15:16:47 +0000
@@ -195,7 +195,7 @@
 
 First create a superuser and start all MAAS services::
 
-    $ bin/maas-region-admin createadmin
+    $ bin/maas-region createadmin
     $ make run
 
 Substitute your own email.  The command will prompt for a choice of password.
@@ -412,7 +412,7 @@
 
 Generate the migration script with::
 
-    $ ./bin/maas-region-admin makemigrations --name description_of_the_change maasserver
+    $ ./bin/maas-region makemigrations --name description_of_the_change maasserver
 
 This will generate a migration module named
 ``src/maasserver/migrations/builtin/<auto_number>_description_of_the_change.py``.
@@ -432,7 +432,7 @@
 to run Django's `makemigrations`_ command. For instance, if you want to perform
 changes to the ``maasserver`` application, run::
 
-    $ ./bin/maas-region-admin makemigrations --empty --name description_of_the_change maasserver
+    $ ./bin/maas-region makemigrations --empty --name description_of_the_change maasserver
 
 This will generate a migration module named
 ``src/maasserver/migrations/builtin/<auto_number>_description_of_the_change.py``.
@@ -458,13 +458,13 @@
 provide the entire schema in the initial migration. All of this logic is
 performed on upgrade by the `dbupgrade` command.::
 
-    $ bin/maas-region-admin dbupgrade
+    $ bin/maas-region dbupgrade
 
 In some testing case you might need to always run the South_ migrations before
 the Django_ migrations on a clean database. Using the `always-south` option on
 the `dbupgrade` command allows this testing scenario.::
 
-    $ bin/maas-region-admin dbupgrade --always-south
+    $ bin/maas-region dbupgrade --always-south
 
 .. Note::
 
@@ -481,14 +481,14 @@
 
 If you need to get an interactive ``psql`` prompt, you can use `dbshell`_::
 
-    $ bin/maas-region-admin dbshell
+    $ bin/maas-region dbshell
 
 .. _dbshell: https://docs.djangoproject.com/en/dev/ref/django-admin/#dbshell
 
 If you need to do the same thing with a version of MAAS you have installed
 from the package, you can use::
 
-    $ sudo maas-region-admin dbshell --installed
+    $ sudo maas-region dbshell --installed
 
 You can use the ``\dt`` command to list the tables in the MAAS database. You
 can also execute arbitrary SQL. For example:::

=== modified file 'INSTALL.txt'
--- INSTALL.txt	2016-03-07 15:16:47 +0000
+++ INSTALL.txt	2016-03-07 15:16:47 +0000
@@ -266,7 +266,7 @@
 Once MAAS is installed, you'll need to create an administrator
 account::
 
-  $ sudo maas-region-admin createadmin --username=root --email=[e-mail]
+  $ sudo maas-region createadmin --username=root --email=[e-mail]
 
 Substitute your own email address for [e-mail].  You may also
 use a different username for your administrator account, but "root" is a

=== modified file 'Makefile'
--- Makefile	2016-03-07 15:16:47 +0000
+++ Makefile	2016-03-07 15:16:47 +0000
@@ -53,7 +53,7 @@
     bin/maas \
     bin/maas-probe-dhcp \
     bin/maas-rack \
-    bin/maas-region-admin \
+    bin/maas-region \
     bin/twistd.rack \
     bin/twistd.region \
     bin/test.cli \
@@ -95,7 +95,7 @@
 	$(buildout) install database
 	@touch --no-create $@
 
-bin/maas-region-admin bin/twistd.region: \
+bin/maas-region bin/twistd.region: \
     data bin/buildout buildout.cfg versions.cfg setup.py $(js_enums)
 	$(buildout) install region
 	@touch --no-create $@
@@ -121,10 +121,10 @@
 	$(buildout) install e2e-test
 	@touch --no-create $@
 
-# bin/maas-region-admin is needed for South migration tests. bin/flake8 is
+# bin/maas-region is needed for South migration tests. bin/flake8 is
 # needed for checking lint and bin/sass is needed for checking css.
 bin/test.testing: \
-    bin/maas-region-admin bin/flake8 bin/sass bin/buildout \
+    bin/maas-region bin/flake8 bin/sass bin/buildout \
     buildout.cfg versions.cfg setup.py
 	$(buildout) install testing-test
 	@touch --no-create $@
@@ -277,11 +277,11 @@
 
 check: clean test
 
-docs/api.rst: bin/maas-region-admin src/maasserver/api/doc_handler.py syncdb
-	bin/maas-region-admin generate_api_doc > $@
+docs/api.rst: bin/maas-region src/maasserver/api/doc_handler.py syncdb
+	bin/maas-region generate_api_doc > $@
 
-sampledata: bin/maas-region-admin bin/database syncdb
-	$(dbrun) bin/maas-region-admin generate_sample_data
+sampledata: bin/maas-region bin/database syncdb
+	$(dbrun) bin/maas-region generate_sample_data
 
 doc: bin/sphinx docs/api.rst
 	bin/sphinx
@@ -357,14 +357,14 @@
 distclean: clean
 	$(warning 'distclean' is deprecated; use 'clean')
 
-harness: bin/maas-region-admin bin/database
-	$(dbrun) bin/maas-region-admin shell --settings=maas.demo
+harness: bin/maas-region bin/database
+	$(dbrun) bin/maas-region shell --settings=maas.demo
 
 dbharness: bin/database
 	bin/database --preserve shell
 
-syncdb: bin/maas-region-admin bin/database
-	$(dbrun) bin/maas-region-admin dbupgrade
+syncdb: bin/maas-region bin/database
+	$(dbrun) bin/maas-region dbupgrade
 
 define phony_targets
   build
@@ -495,9 +495,9 @@
 
 services/reloader/@deps:
 
-services/regiond/@deps: bin/maas-region-admin
+services/regiond/@deps: bin/maas-region
 
-services/regiond2/@deps: bin/maas-region-admin
+services/regiond2/@deps: bin/maas-region
 
 #
 # Package building

=== modified file 'buildout.cfg'
--- buildout.cfg	2016-03-07 15:16:47 +0000
+++ buildout.cfg	2016-03-07 15:16:47 +0000
@@ -81,13 +81,13 @@
 eggs =
   ${region:test-eggs}
 entry-points =
-  maas-region-admin=maasserver:execute_from_command_line
+  maas-region=maasserver:execute_from_command_line
   twistd.region=twisted.scripts.twistd:run
 initialization =
   ${common:initialization}
   environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.development")
 scripts =
-  maas-region-admin
+  maas-region
   twistd.region
 extra-paths =
   ${common:extra-paths}

=== modified file 'docs/conf.py'
--- docs/conf.py	2016-02-17 16:12:30 +0000
+++ docs/conf.py	2016-03-07 15:16:47 +0000
@@ -281,7 +281,7 @@
 man_pages = [
     ('man/maas.8', 'maas', u'MAAS API commandline utility',
      [u'Canonical 2013-2014'], 8),
-    ('man/maas-region-admin.8', 'maas-region-admin', u'MAAS administration tool',
+    ('man/maas-region.8', 'maas-region', u'MAAS administration tool',
      [u'Canonical 2013-2014'], 8)
 ]
 

=== modified file 'docs/configure.rst'
--- docs/configure.rst	2015-09-08 18:41:57 +0000
+++ docs/configure.rst	2016-03-07 15:16:47 +0000
@@ -55,9 +55,9 @@
 
 Ensure that the Apache config file from ``etc/maas/maas-http.conf`` is
 included in ``/etc/apache2/conf.d/``, then set the default URL using the
-``maas-region-admin`` command to use ``https`` instead of ``http``::
+``maas-region`` command to use ``https`` instead of ``http``::
 
-  $ maas-region-admin local_config_set \
+  $ maas-region local_config_set \
   >   --maas-url="https://localhost:5240/MAAS"
 
 Now, restart Apache::

=== modified file 'docs/index.rst'
--- docs/index.rst	2015-11-10 22:30:16 +0000
+++ docs/index.rst	2016-03-07 15:16:47 +0000
@@ -113,7 +113,7 @@
 .. toctree::
    :maxdepth: 1
 
-   man/maas-region-admin.8
+   man/maas-region.8
    man/maas.8
 
 

=== modified file 'docs/maascli.rst'
--- docs/maascli.rst	2016-01-25 14:10:29 +0000
+++ docs/maascli.rst	2016-03-07 15:16:47 +0000
@@ -40,7 +40,7 @@
 To obtain the key through the command line, run this command on the region
 controller (it requires root access)::
 
- $ sudo maas-region-admin apikey --username=my-username
+ $ sudo maas-region apikey --username=my-username
 
 (Substitute your MAAS user name for my-username).
 

=== renamed file 'docs/man/maas-region-admin.8.rst' => 'docs/man/maas-region.8.rst'
--- docs/man/maas-region-admin.8.rst	2014-05-05 16:20:18 +0000
+++ docs/man/maas-region.8.rst	2016-03-07 15:16:47 +0000
@@ -1,11 +1,11 @@
-maas-region-admin
------------------
+maas-region
+-----------
 
 
 Usage
 ^^^^^
 
-maas-region-admin  [-h, --help] createadmin | changepassword | shell
+maas-region  [-h, --help] createadmin | changepassword | shell
 
 
 Description

=== renamed file 'man/maas-region-admin.8' => 'man/maas-region.8'
--- man/maas-region-admin.8	2015-10-15 15:17:24 +0000
+++ man/maas-region.8	2016-03-07 15:16:47 +0000
@@ -1,8 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "MAAS-REGION-ADMIN" "8" "October 15, 2015" "dev" "MAAS"
+.TH "MAAS-REGION" "8" "October 15, 2015" "dev" "MAAS"
 .SH NAME
-maas-region-admin \- MAAS administration tool
+maas-region \- MAAS administration tool
 .
 .nr rst2man-indent-level 0
 .

=== modified file 'services/dns/run'
--- services/dns/run	2015-12-11 17:13:38 +0000
+++ services/dns/run	2016-03-07 15:16:47 +0000
@@ -34,10 +34,10 @@
 
 # Create MAAS' DNS config: do not overwrite an existing config file
 # as the writing of the full configuration might have happened already.
-bin/maas-region-admin set_up_dns --no-clobber
+bin/maas-region set_up_dns --no-clobber
 
 # Edit the fixture's named.conf to include MAAS' DNS config.
-bin/maas-region-admin get_named_conf \
+bin/maas-region get_named_conf \
     --edit --config_path "${homedir}/named.conf"
 
 # Run named.

=== modified file 'src/maas/demo.py'
--- src/maas/demo.py	2016-01-20 00:07:16 +0000
+++ src/maas/demo.py	2016-03-07 15:16:47 +0000
@@ -27,7 +27,7 @@
 # Connect to the DHCP server. TODO: Use the signals manager instead.
 DHCP_CONNECT = True
 
-MAAS_CLI = abspath("bin/maas-region-admin")
+MAAS_CLI = abspath("bin/maas-region")
 
 # For demo purposes, give nodes unauthenticated access to their metadata
 # even if we can't pass boot parameters.  This is not safe; do not

=== modified file 'src/maas/settings.py'
--- src/maas/settings.py	2016-01-25 14:10:29 +0000
+++ src/maas/settings.py	2016-03-07 15:16:47 +0000
@@ -79,7 +79,7 @@
 DHCP_CONNECT = True
 
 # The MAAS CLI.
-MAAS_CLI = 'sudo maas-region-admin'
+MAAS_CLI = 'sudo maas-region'
 
 API_URL_REGEXP = '^/api/2[.]0/'
 METADATA_URL_REGEXP = '^/metadata/'

=== modified file 'src/maasserver/dns/zonegenerator.py'
--- src/maasserver/dns/zonegenerator.py	2016-02-18 17:31:45 +0000
+++ src/maasserver/dns/zonegenerator.py	2016-03-07 15:16:47 +0000
@@ -94,7 +94,7 @@
     "The DNS server will use the address '%s',  which is inside the "
     "loopback network.  This may not be a problem if you're not using "
     "MAAS's DNS features or if you don't rely on this information. "
-    "Consult the 'maas-region-admin local_config_set --maas-url' command "
+    "Consult the 'maas-region local_config_set --maas-url' command "
     "for details on how to set the MAAS URL.")
 
 
@@ -108,7 +108,7 @@
     """Return the DNS server's IP address.
 
     That address is derived from the config maas_url or rack_controller.url.
-    Consult the 'maas-region-admin local_config_set --maas-url' command for
+    Consult the 'maas-region local_config_set --maas-url' command for
     details on how to set the MAAS URL.
 
     :param rack_controller: Optional rack controller to which the DNS server
@@ -127,7 +127,7 @@
             "Unable to find MAAS server IP address: %s. MAAS's DNS server "
             "requires this IP address for the NS records in its zone files. "
             "Make sure that the configuration setting for the MAAS URL has "
-            "the correct hostname. Consult the 'maas-region-admin "
+            "the correct hostname. Consult the 'maas-region "
             "local_config_set --maas-url' command."
             % e.strerror)
 

=== modified file 'src/maasserver/management/commands/template.py'
--- src/maasserver/management/commands/template.py	2016-03-04 05:31:08 +0000
+++ src/maasserver/management/commands/template.py	2016-03-07 15:16:47 +0000
@@ -40,7 +40,7 @@
         template.delete()
     if verbosity > 0:
         stdout.write("It would now be wise to run:\n")
-        stdout.write("    sudo maas-region-admin template update-defaults\n")
+        stdout.write("    sudo maas-region template update-defaults\n")
 
 
 class Command(BaseCommand):

=== modified file 'src/maasserver/server_address.py'
--- src/maasserver/server_address.py	2016-02-02 14:20:45 +0000
+++ src/maasserver/server_address.py	2016-03-07 15:16:47 +0000
@@ -40,7 +40,7 @@
     """Return address where nodes and workers can reach the MAAS server.
 
     The address is taken from the configured MAAS URL or `controller.url`.
-    Consult the 'maas-region-admin local_config_set' command for details on
+    Consult the 'maas-region local_config_set' command for details on
     how to set the MAAS URL.
 
     If there is more than one IP address for the host, the addresses

=== modified file 'src/maasserver/utils/__init__.py'
--- src/maasserver/utils/__init__.py	2016-02-02 14:20:45 +0000
+++ src/maasserver/utils/__init__.py	2016-03-07 15:16:47 +0000
@@ -46,7 +46,7 @@
     calls Django's 'reverse' method and prefixes the result of that call with
     the configured MAAS URL.
 
-    Consult the 'maas-region-admin local_config_set --default-url' command for
+    Consult the 'maas-region local_config_set --default-url' command for
     details on how to set the MAAS URL.
 
     :param view_name: Django's view function name/reference or URL pattern

=== modified file 'src/maastesting/tests/test_dbupgrade.py'
--- src/maastesting/tests/test_dbupgrade.py	2015-12-01 18:12:59 +0000
+++ src/maastesting/tests/test_dbupgrade.py	2016-03-07 15:16:47 +0000
@@ -41,7 +41,7 @@
         env = os.environ.copy()
         env["DEV_DB_NAME"] = "test_maas_dbupgrade"
         env["MAAS_PREVENT_MIGRATIONS"] = "0"
-        mra = os.path.join(root, "bin", "maas-region-admin")
+        mra = os.path.join(root, "bin", "maas-region")
         cmd = [mra, "dbupgrade"]
         if always_south:
             cmd.append("--always-south")

=== modified file 'utilities/remote-reinstall'
--- utilities/remote-reinstall	2016-02-26 18:41:33 +0000
+++ utilities/remote-reinstall	2016-03-07 15:16:47 +0000
@@ -90,7 +90,7 @@
 $ssh_run rm -rf /usr/share/maas/web/static/*
 $ssh_run mv /usr/lib/python3/dist-packages/maasserver/static/* /usr/share/maas/web/static/
 $ssh_run service maas-regiond stop
-$ssh_run maas-region-admin migrate
+$ssh_run maas-region migrate
 sleep 1
 $ssh_run service maas-regiond start
 $ssh_run service apache2 restart