Merge lp:~chipaca/snappy/activate-package into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

activate/deactivate packages.

[lp:~chipaca/snappy/activate-package]

727. By John Lenton on 2015-09-29

Merged current-data-dir into activate-package.

[Michael Vogt (mvo)]

Very nice!

review: Approve

=== added file 'cmd/snappy/cmd_activate.go'
--- cmd/snappy/cmd_activate.go	1970-01-01 00:00:00 +0000
+++ cmd/snappy/cmd_activate.go	2015-09-29 12:18:14 +0000
@@ -0,0 +1,60 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package main
+
+import (
+	"launchpad.net/snappy/i18n"
+	"launchpad.net/snappy/logger"
+	"launchpad.net/snappy/progress"
+	"launchpad.net/snappy/snappy"
+)
+
+type cmdActivate struct {
+	Args struct {
+		Snap string `positional-arg-name:"snap"`
+	} `positional-args:"yes" required:"very yes"`
+	activate bool
+}
+
+func init() {
+	_, err := parser.AddCommand("activate",
+		i18n.G(`Activate a package`),
+		i18n.G(`Activate a package that has previously been deactivated. If the package is already activated, do nothing.`),
+		&cmdActivate{activate: true})
+	if err != nil {
+		logger.Panicf("Unable to activate: %v", err)
+	}
+
+	_, err = parser.AddCommand("deactivate",
+		i18n.G(`Deactivate a package`),
+		i18n.G(`Deactivate a package. If the package is already deactivated, do nothing.`),
+		&cmdActivate{activate: false})
+	if err != nil {
+		logger.Panicf("Unable to deactivate: %v", err)
+	}
+}
+
+func (x *cmdActivate) Execute(args []string) error {
+	return withMutex(x.doActivate)
+}
+
+func (x *cmdActivate) doActivate() error {
+	return snappy.SetActive(x.Args.Snap, x.activate, progress.MakeProgressBar())
+}

=== modified file 'daemon/api.go'
--- daemon/api.go	2015-09-15 12:57:04 +0000
+++ daemon/api.go	2015-09-29 12:18:14 +0000
@@ -569,6 +569,14 @@
 	return err
 }
 
+func (inst *packageInstruction) activate() interface{} {
+	return snappy.SetActive(inst.pkg, true, inst.prog)
+}
+
+func (inst *packageInstruction) deactivate() interface{} {
+	return snappy.SetActive(inst.pkg, false, inst.prog)
+}
+
 func (inst *packageInstruction) dispatch() func() interface{} {
 	switch inst.Action {
 	case "install":
@@ -582,6 +590,10 @@
 		return inst.purge
 	case "rollback":
 		return inst.rollback
+	case "activate":
+		return inst.activate
+	case "deactivate":
+		return inst.deactivate
 	default:
 		return nil
 	}

=== modified file 'daemon/snappy_part_iface_test.go'
--- daemon/snappy_part_iface_test.go	2015-09-14 14:35:06 +0000
+++ daemon/snappy_part_iface_test.go	2015-09-29 12:18:14 +0000
@@ -83,8 +83,8 @@
 	}
 	return p.config, p.configErr
 }
-func (p *tP) SetActive(progress.Meter) error { return p.setActiveErr }
-func (p *tP) Frameworks() ([]string, error)  { return p.frameworks, p.frameworksErr }
+func (p *tP) SetActive(bool, progress.Meter) error { return p.setActiveErr }
+func (p *tP) Frameworks() ([]string, error)        { return p.frameworks, p.frameworksErr }
 
 // for ServiceYamler interface:
 func (p *tP) ServiceYamls() []snappy.ServiceYaml { return p.svcYamls }

=== modified file 'po/snappy.pot'
--- po/snappy.pot	2015-09-14 09:22:43 +0000
+++ po/snappy.pot	2015-09-29 12:18:14 +0000
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: snappy\n"
         "Report-Msgid-Bugs-To: [e-mail]\n"
-        "POT-Creation-Date: 2015-09-14 10:22+0100\n"
+        "POT-Creation-Date: 2015-09-29 10:18+0100\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -61,6 +61,12 @@
         "The verbose version of the info command for a package will also tell you the available channels for that package, when it was installed for the first time, disk space utilization, and in the case of frameworks, which apps are able to use the framework."
 msgstr  ""
 
+msgid   "Activate a package"
+msgstr  ""
+
+msgid   "Activate a package that has previously been deactivated. If the package is already activated, do nothing."
+msgstr  ""
+
 msgid   "Allows rollback of a snap to a previous installed version. Without any arguments, the previous installed version is selected. It is also possible to specify the version to rollback to as a additional argument.\n"
 msgstr  ""
 
@@ -84,6 +90,12 @@
 msgid   "Creates a snap package and if available, runs the review scripts."
 msgstr  ""
 
+msgid   "Deactivate a package"
+msgstr  ""
+
+msgid   "Deactivate a package. If the package is already deactivated, do nothing."
+msgstr  ""
+
 msgid   "Display a summary of key attributes of the snappy system."
 msgstr  ""
 

=== modified file 'snappy/parts.go'
--- snappy/parts.go	2015-09-25 15:27:11 +0000
+++ snappy/parts.go	2015-09-29 12:18:14 +0000
@@ -92,8 +92,8 @@
 	// Config takes a yaml configuration and returns the full snap
 	// config with the changes. Note that "configuration" may be empty.
 	Config(configuration []byte) (newConfig string, err error)
-	// make a inactive part active
-	SetActive(pb progress.Meter) error
+	// make an inactive part active, or viceversa
+	SetActive(bool, progress.Meter) error
 
 	// get the list of frameworks needed by the part
 	Frameworks() ([]string, error)
@@ -334,7 +334,7 @@
 	case 0:
 		return fmt.Errorf("Can not find %s with version %s", pkg, ver)
 	case 1:
-		return parts[0].SetActive(inter)
+		return parts[0].SetActive(true, inter)
 	default:
 		return fmt.Errorf("More than one %s with version %s", pkg, ver)
 	}

=== added file 'snappy/set_active.go'
--- snappy/set_active.go	1970-01-01 00:00:00 +0000
+++ snappy/set_active.go	2015-09-29 12:18:14 +0000
@@ -0,0 +1,53 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package snappy
+
+import (
+	"sort"
+
+	"launchpad.net/snappy/progress"
+)
+
+// SetActive sets the active state of the given package
+func SetActive(fullName string, active bool, meter progress.Meter) error {
+	// TODO: switch this to using husks
+	m := NewMetaLocalRepository()
+	installed, err := m.Installed()
+	if err != nil {
+		return err
+	}
+
+	parts := FindSnapsByName(fullName, installed)
+	if len(parts) == 0 {
+		return ErrPackageNotFound
+	}
+
+	sort.Sort(sort.Reverse(BySnapVersion(parts)))
+
+	part := parts[0]
+	for i := range parts {
+		if parts[i].IsActive() {
+			part = parts[i]
+			break
+		}
+	}
+
+	return part.SetActive(active, meter)
+}

=== added file 'snappy/set_active_test.go'
--- snappy/set_active_test.go	1970-01-01 00:00:00 +0000
+++ snappy/set_active_test.go	2015-09-29 12:18:14 +0000
@@ -0,0 +1,20 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package snappy

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-09-29 07:07:13 +0000
+++ snappy/snapp.go	2015-09-29 12:18:14 +0000
@@ -981,8 +981,12 @@
 }
 
 // SetActive sets the snap active
-func (s *SnapPart) SetActive(pb progress.Meter) (err error) {
-	return s.activate(false, pb)
+func (s *SnapPart) SetActive(active bool, pb progress.Meter) (err error) {
+	if active {
+		return s.activate(false, pb)
+	}
+
+	return s.deactivate(false, pb)
 }
 
 func (s *SnapPart) activate(inhibitHooks bool, inter interacter) error {
@@ -1653,7 +1657,7 @@
 }
 
 // SetActive sets the snap active
-func (s *RemoteSnapPart) SetActive(progress.Meter) error {
+func (s *RemoteSnapPart) SetActive(bool, progress.Meter) error {
 	return ErrNotInstalled
 }
 

=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go	2015-09-25 15:27:11 +0000
+++ snappy/snapp_test.go	2015-09-29 12:18:14 +0000
@@ -770,7 +770,8 @@
 func (s *SnapTestSuite) TestRemoteSnapErrors(c *C) {
 	snap := RemoteSnapPart{}
 
-	c.Assert(snap.SetActive(nil), Equals, ErrNotInstalled)
+	c.Assert(snap.SetActive(true, nil), Equals, ErrNotInstalled)
+	c.Assert(snap.SetActive(false, nil), Equals, ErrNotInstalled)
 	c.Assert(snap.Uninstall(nil), Equals, ErrNotInstalled)
 }
 

=== modified file 'snappy/systemimage.go'
--- snappy/systemimage.go	2015-09-15 12:55:09 +0000
+++ snappy/systemimage.go	2015-09-29 12:18:14 +0000
@@ -155,18 +155,30 @@
 }
 
 // SetActive sets the snap active
-func (s *SystemImagePart) SetActive(pb progress.Meter) (err error) {
+func (s *SystemImagePart) SetActive(active bool, pb progress.Meter) error {
 	isNextBootOther := s.partition.IsNextBootOther()
-	// active and no switch scheduled -> nothing to do
-	if s.IsActive() && !isNextBootOther {
-		return nil
-	}
-	// not currently active but switch scheduled already -> nothing to do
-	if !s.IsActive() && isNextBootOther {
-		return nil
-	}
-
-	return s.partition.ToggleNextBoot()
+	isActive := s.IsActive()
+
+	// * active
+	// | * isActive
+	// | | * isNextBootOther
+	// | | |
+	// F F F nop
+	// F F T toggle
+	// F T F toggle
+	// F T T nop
+	// T F F toggle
+	// T F T nop
+	// T T F nop
+	// T T T toggle
+	//
+	// ∴ this function is the parity (a.k.a. XOR, ⊻) of these inputs \o/
+	// ( and, ∀ p, q boolean: p ⊻ q ⇔ p ≠ q )
+	if active != isActive != isNextBootOther {
+		return s.partition.ToggleNextBoot()
+	}
+
+	return nil
 }
 
 // override in tests

=== modified file 'snappy/systemimage_test.go'
--- snappy/systemimage_test.go	2015-07-15 07:53:43 +0000
+++ snappy/systemimage_test.go	2015-09-29 12:18:14 +0000
@@ -147,13 +147,13 @@
 }
 
 type MockPartition struct {
-	toggleNextBootCalled      bool
+	toggleNextBoot            bool
 	markBootSuccessfulCalled  bool
 	syncBootloaderFilesCalled bool
 }
 
 func (p *MockPartition) ToggleNextBoot() error {
-	p.toggleNextBootCalled = true
+	p.toggleNextBoot = !p.toggleNextBoot
 	return nil
 }
 
@@ -166,7 +166,7 @@
 	return nil
 }
 func (p *MockPartition) IsNextBootOther() bool {
-	return false
+	return p.toggleNextBoot
 }
 
 func (p *MockPartition) RunWithOther(option partition.MountOption, f func(otherRoot string) (err error)) (err error) {
@@ -199,7 +199,7 @@
 	// do the install
 	_, err = sp.Install(pb, 0)
 	c.Assert(err, IsNil)
-	c.Assert(mockPartition.toggleNextBootCalled, Equals, true)
+	c.Assert(mockPartition.toggleNextBoot, Equals, true)
 	c.Assert(pb.total, Equals, 100.0)
 	c.Assert(pb.spin, Equals, true)
 	c.Assert(pb.spinMsg, Equals, "Applying")
@@ -269,7 +269,7 @@
 
 	_, err = sp.Install(nil, 0)
 	c.Assert(err, IsNil)
-	c.Assert(mockPartition.toggleNextBootCalled, Equals, true)
+	c.Assert(mockPartition.toggleNextBoot, Equals, true)
 }
 
 func (s *SITestSuite) TestSystemImagePartSetActiveAlreadyActive(c *C) {
@@ -280,9 +280,9 @@
 	mockPartition := MockPartition{}
 	sp.partition = &mockPartition
 
-	err = sp.SetActive(nil)
+	err = sp.SetActive(true, nil)
 	c.Assert(err, IsNil)
-	c.Assert(mockPartition.toggleNextBootCalled, Equals, false)
+	c.Assert(mockPartition.toggleNextBoot, Equals, false)
 }
 
 func (s *SITestSuite) TestSystemImagePartSetActiveMakeActive(c *C) {
@@ -293,9 +293,92 @@
 	mockPartition := MockPartition{}
 	sp.partition = &mockPartition
 
-	err = sp.SetActive(nil)
-	c.Assert(err, IsNil)
-	c.Assert(mockPartition.toggleNextBootCalled, Equals, true)
+	err = sp.SetActive(true, nil)
+	c.Assert(err, IsNil)
+	c.Assert(mockPartition.toggleNextBoot, Equals, true)
+}
+
+func (s *SITestSuite) TestSystemImagePartSetActiveAlreadyToggled(c *C) {
+	// in other words, check that calling SetActive twice does not
+	// untoggle
+	parts, err := s.systemImage.Installed()
+
+	sp := parts[1].(*SystemImagePart)
+	c.Assert(sp.IsActive(), Equals, false)
+	mockPartition := MockPartition{toggleNextBoot: true}
+	sp.partition = &mockPartition
+
+	err = sp.SetActive(true, nil)
+	c.Assert(err, IsNil)
+	c.Assert(mockPartition.toggleNextBoot, Equals, true)
+}
+
+func (s *SITestSuite) TestSystemImagePartSetActiveAlreadyActiveAlreadyToggled(c *C) {
+	// in other words, check that calling SetActive on one
+	// partition when it's been called on the other one undoes the
+	// toggle
+	parts, err := s.systemImage.Installed()
+
+	sp := parts[0].(*SystemImagePart)
+	c.Assert(sp.IsActive(), Equals, true)
+	mockPartition := MockPartition{toggleNextBoot: true}
+	sp.partition = &mockPartition
+
+	err = sp.SetActive(true, nil)
+	c.Assert(err, IsNil)
+	c.Assert(mockPartition.toggleNextBoot, Equals, false)
+}
+
+func (s *SITestSuite) TestSystemImagePartUnsetActiveOnActive(c *C) {
+	parts, err := s.systemImage.Installed()
+
+	sp := parts[0].(*SystemImagePart)
+	c.Assert(sp.IsActive(), Equals, true)
+	mockPartition := MockPartition{}
+	sp.partition = &mockPartition
+
+	err = sp.SetActive(false, nil)
+	c.Assert(err, IsNil)
+	c.Assert(mockPartition.toggleNextBoot, Equals, true)
+}
+
+func (s *SITestSuite) TestSystemImagePartUnsetActiveOnUnactiveNOP(c *C) {
+	parts, err := s.systemImage.Installed()
+
+	sp := parts[1].(*SystemImagePart)
+	c.Assert(sp.IsActive(), Equals, false)
+	mockPartition := MockPartition{}
+	sp.partition = &mockPartition
+
+	err = sp.SetActive(false, nil)
+	c.Assert(err, IsNil)
+	c.Assert(mockPartition.toggleNextBoot, Equals, false)
+}
+
+func (s *SITestSuite) TestSystemImagePartUnsetActiveAlreadyToggled(c *C) {
+	parts, err := s.systemImage.Installed()
+
+	sp := parts[1].(*SystemImagePart)
+	c.Assert(sp.IsActive(), Equals, false)
+	mockPartition := MockPartition{toggleNextBoot: true}
+	sp.partition = &mockPartition
+
+	err = sp.SetActive(false, nil)
+	c.Assert(err, IsNil)
+	c.Assert(mockPartition.toggleNextBoot, Equals, false)
+}
+
+func (s *SITestSuite) TestSystemImagePartUnsetActiveAlreadyActiveAlreadyToggled(c *C) {
+	parts, err := s.systemImage.Installed()
+
+	sp := parts[0].(*SystemImagePart)
+	c.Assert(sp.IsActive(), Equals, true)
+	mockPartition := MockPartition{toggleNextBoot: true}
+	sp.partition = &mockPartition
+
+	err = sp.SetActive(false, nil)
+	c.Assert(err, IsNil)
+	c.Assert(mockPartition.toggleNextBoot, Equals, true)
 }
 
 func (s *SITestSuite) TestTestVerifyUpgradeWasAppliedSuccess(c *C) {
@@ -464,7 +547,7 @@
 
 	// ensure that we do not sync the bootfiles in this case (see above)
 	c.Assert(mockPartition.syncBootloaderFilesCalled, Equals, false)
-	c.Assert(mockPartition.toggleNextBootCalled, Equals, true)
+	c.Assert(mockPartition.toggleNextBoot, Equals, true)
 }
 
 func (s *SITestSuite) TestNeedsBootAssetSyncNeedsSync(c *C) {