launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

Andres Rodriguez has proposed merging lp:~andreserl/maas/change_profile_name into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/change_profile_name/+merge/97955
-- 
https://code.launchpad.net/~andreserl/maas/change_profile_name/+merge/97955
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/change_profile_name into lp:maas.

=== modified file 'src/maasserver/provisioning.py'
--- src/maasserver/provisioning.py	2012-03-15 13:58:32 +0000
+++ src/maasserver/provisioning.py	2012-03-16 18:38:18 +0000
@@ -106,7 +106,7 @@
     """Select which profile a node should be configured for."""
     assert node.architecture, "Node's architecture is not known."
     cobbler_arch = name_arch_in_cobbler_style(node.architecture)
-    return "%s-%s" % ("precise", cobbler_arch)
+    return "maas-%s-%s" % ("precise", cobbler_arch)
 
 
 @receiver(post_save, sender=Node)

=== modified file 'src/maasserver/tests/test_provisioning.py'
--- src/maasserver/tests/test_provisioning.py	2012-03-14 11:29:01 +0000
+++ src/maasserver/tests/test_provisioning.py	2012-03-16 18:38:18 +0000
@@ -83,14 +83,14 @@
         self.papi.modify_nodes(
             {node.system_id: {'profile': self.make_papi_profile()}})
         self.assertEqual(
-            'precise-i386', select_profile_for_node(node, self.papi))
+            'maas-precise-i386', select_profile_for_node(node, self.papi))
 
     def test_select_profile_for_node_selects_Precise_and_right_arch(self):
         nodes = {
             arch: self.make_node_without_saving(arch=arch)
             for arch in map_enum(ARCHITECTURE).values()}
         self.assertItemsEqual([
-                'precise-%s' % name_arch_in_cobbler_style(arch)
+                'maas-precise-%s' % name_arch_in_cobbler_style(arch)
                 for arch in nodes.keys()],
             [
                 select_profile_for_node(node, self.papi)
@@ -110,7 +110,7 @@
             sender=Node, instance=node, created=True)
         system_id = node.system_id
         pserv_node = self.papi.get_nodes_by_name([system_id])[system_id]
-        self.assertEqual("precise-i386", pserv_node["profile"])
+        self.assertEqual("maas-precise-i386", pserv_node["profile"])
 
     def test_provision_post_save_Node_registers_effective_power_type(self):
         power_types = list(map_enum(POWER_TYPE).values())