Merge lp:~jdstrand/snappy/snappy.network-client into lp:~snappy-dev/snappy/snappy-moved-to-github

[Jamie Strandboge]

Use the network-client cap instead of the old, deprecated networking cap. network-client was available on 15.04 so this is safe to backport to the stable branch as well.

Use the network-client cap instead of the old, deprecated networking cap. network-client was available on 15.04 so this is safe to backport to the stable branch as well.

[Michael Vogt (mvo)]

Thanks for the branch! We move to github the other day but no worries, I converted the branch and created a github pull request: https://github.com/ubuntu-core/snappy/pull/25

[Michael Vogt (mvo)]

I commented in LP.

[Michael Vogt (mvo)]

Eh, commented in github.

Unmerged revisions

799. By Jamie Strandboge on 2015-10-26

use the network-client cap instead of the old, deprecated networking cap.
network-client was available on 15.04 so this is safe to backport to the
stable branch as well.

=== modified file 'docs/frameworks.md'
--- docs/frameworks.md	2015-06-03 11:48:37 +0000
+++ docs/frameworks.md	2015-10-26 21:32:22 +0000
@@ -162,7 +162,7 @@
         description: "desc for qux service"
         start: bin/qux
         caps:
-          - networking
+          - network-client
           - foo_bar-client
 
 See `security.md` for more information on specifying `caps` and a

=== modified file 'snappy/security.go'
--- snappy/security.go	2015-09-25 15:27:11 +0000
+++ snappy/security.go	2015-10-26 21:32:22 +0000
@@ -52,7 +52,7 @@
 
 const defaultTemplate = "default"
 
-var defaultPolicyGroups = []string{"networking"}
+var defaultPolicyGroups = []string{"network-client"}
 
 // TODO: autodetect, this won't work for personal
 const defaultPolicyVendor = "ubuntu-core"

=== modified file 'snappy/security_test.go'
--- snappy/security_test.go	2015-09-25 15:27:11 +0000
+++ snappy/security_test.go	2015-10-26 21:32:22 +0000
@@ -90,7 +90,7 @@
 	a.verifyApparmorFile(c, `{
   "template": "default",
   "policy_groups": [
-    "networking"
+    "network-client"
   ],
   "policy_vendor": "ubuntu-core",
   "policy_version": 15.04
@@ -221,7 +221,7 @@
 		"--policy-vendor=ubuntu-core",
 		"--policy-version=15.04",
 		"--template=something",
-		"--policy-groups=networking",
+		"--policy-groups=network-client",
 	})
 }
 

=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go	2015-10-20 07:03:39 +0000
+++ snappy/snapp_test.go	2015-10-26 21:32:22 +0000
@@ -1018,7 +1018,7 @@
    stop: bin/testme-service.stop
    description: "testme service"
    caps:
-     - "networking"
+     - "network-client"
      - "foo_group"
    security-template: "foo_template"
 `)
@@ -1031,7 +1031,7 @@
 	c.Assert(m.ServiceYamls[0].Start, Equals, "bin/testme-service.start")
 	c.Assert(m.ServiceYamls[0].Stop, Equals, "bin/testme-service.stop")
 	c.Assert(m.ServiceYamls[0].SecurityCaps, HasLen, 2)
-	c.Assert(m.ServiceYamls[0].SecurityCaps[0], Equals, "networking")
+	c.Assert(m.ServiceYamls[0].SecurityCaps[0], Equals, "network-client")
 	c.Assert(m.ServiceYamls[0].SecurityCaps[1], Equals, "foo_group")
 	c.Assert(m.ServiceYamls[0].SecurityTemplate, Equals, "foo_template")
 }