Merge lp:~newell-jensen/maas/fix-1465353 into lp:maas/trunk

[Newell Jensen]

Fix typo s/mcsm/mscm for the MSCM that is blocking probe_and_enlist_hardware from working properly.

[Clark Laughlin (clark-laughlin)]

Worked for me

[Mike Pontillo (mpontillo)]

Looks good.

review: Approve

[Mike Pontillo (mpontillo)]

Also, my apologies; looks like I'm the one who introduced this! Sorry about that.

[Christian Reis (kiko)]

Doh! I'm sorry this isn't caught by our own Moonshot testing; hoping Sean gets a fix in for that.

review: Approve

=== modified file 'src/maasserver/api/nodegroups.py'
--- src/maasserver/api/nodegroups.py	2015-05-18 18:06:15 +0000
+++ src/maasserver/api/nodegroups.py	2015-06-15 18:32:27 +0000
@@ -499,7 +499,7 @@
                 prefix_filter=prefix_filter, accept_all=accept_all)
         elif model == 'ucsm':
             self.do_probe_and_enlist_ucsm(nodegroup, request, user)
-        elif model == 'mcsm':
+        elif model == 'mscm':
             self.do_probe_and_enlist_mscm(nodegroup, request, user)
         elif model == 'msftocs':
             self.do_probe_and_enlist_msftocs(nodegroup, request, user)

=== modified file 'src/maasserver/api/tests/test_nodegroup.py'
--- src/maasserver/api/tests/test_nodegroup.py	2015-05-18 18:06:15 +0000
+++ src/maasserver/api/tests/test_nodegroup.py	2015-06-15 18:32:27 +0000
@@ -553,7 +553,7 @@
                 'op': self.endpoint,
                 # The deprecated version of the API doesn't need the
                 # 'model' key, but it will simply be ignored.
-                'model': 'mcsm',
+                'model': 'mscm',
                 'host': host,
                 'username': username,
                 'password': password,