Merge lp:~jonas-drange/ubuntu-system-settings/vpn into lp:ubuntu-system-settings

[Jonas G. Drange]

New VPN panel with happy path test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1603
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2630/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6687
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/403
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/812
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5074
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6698
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6698/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27952

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2630/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1604
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2636/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6697
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/410
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/819
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5083
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6708
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6708/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27964

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2636/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1606
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2640/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6709/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/414
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/823
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5091/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6720
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6720/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27977

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2640/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1607
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2642/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6718/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/416
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/825
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5095/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6729
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6729/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27983

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2642/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1609
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2650/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6746
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/833
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6757
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6757/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28012

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2650/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1610
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2651/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6747/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/425
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/834
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5116/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6758
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6758/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28013

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2651/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Code review looks good with one nit pick about a blank line, see inline comment. I'm going to go ahead and approve it anyway and trust you'll remove that line. I wasn't able to test it, but I know you and bill have tested it.

review: Approve

[lp:~jonas-drange/ubuntu-system-settings/vpn]

1611. By Jonas G. Drange on 2016-03-14

removing blank line

1612. By Jonas G. Drange on 2016-03-14

fix bad ref to objectName

=== modified file 'debian/control'
--- debian/control	2016-03-12 03:41:03 +0000
+++ debian/control	2016-03-14 15:06:51 +0000
@@ -71,18 +71,18 @@
          gsettings-desktop-schemas,
          gsettings-ubuntu-schemas (>= 0.0.4),
          indicator-bluetooth (>> 0.0.6+13.10.20131010),
-         indicator-network (>= 0.5.0+13.10.20130918),
+         indicator-network (>= 0.7.1),
          indicator-power (>= 12.10.6+15.04.20150130),
          powerd (>= 0.15) | gnome-settings-daemon,
          qmenumodel-qml,
          qml-module-qt-labs-folderlistmodel,
-         qml-module-ubuntu-connectivity (>= 0.5.5),
+         qml-module-ubuntu-connectivity (>= 0.7.1),
          qml-module-qtmultimedia | qml-module-qtmultimedia-gles,
          qtdeclarative5-gsettings1.0 (>=0.1+14.10.20140801.1),
          qtdeclarative5-ofono0.2 (>=0.82~),
          qml-module-qtsysteminfo,
          qtdeclarative5-ubuntu-content1,
-         qtdeclarative5-ubuntu-settings-components (>> 0.6),
+         qtdeclarative5-ubuntu-settings-components (>> 0.7+15.04.20160310),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1584) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1584),
          suru-icon-theme (>= 14.04+15.04.20150813~),
          whoopsie-preferences (>= 0.9),
@@ -96,7 +96,7 @@
          python3-dbus,
          python3-xdg,
          gir1.2-glib-2.0,
-         qml-module-ubuntu-connectivity
+         qml-module-ubuntu-connectivity (>= 0.7.1)
 Recommends: ubuntu-system-settings-online-accounts,
             ubuntu-touch-sounds,
 Conflicts: ubuntu-system-settings-example

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2015-08-25 10:36:13 +0000
+++ plugins/CMakeLists.txt	2016-03-14 15:06:51 +0000
@@ -20,4 +20,5 @@
 add_subdirectory(sound)
 add_subdirectory(system-update)
 add_subdirectory(time-date)
+add_subdirectory(vpn)
 add_subdirectory(wifi)

=== added directory 'plugins/vpn'
=== added file 'plugins/vpn/CMakeLists.txt'
--- plugins/vpn/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/vpn/CMakeLists.txt	2016-03-14 15:06:51 +0000
@@ -0,0 +1,7 @@
+set(QML_SOURCES
+    PageComponent.qml
+)
+
+install(FILES vpn.settings DESTINATION ${PLUGIN_MANIFEST_DIR})
+install(FILES network-vpn.svg DESTINATION ${PLUGIN_MANIFEST_DIR}/icons)
+install(FILES ${QML_SOURCES} DESTINATION ${PLUGIN_QML_DIR}/vpn)

=== added file 'plugins/vpn/PageComponent.qml'
--- plugins/vpn/PageComponent.qml	1970-01-01 00:00:00 +0000
+++ plugins/vpn/PageComponent.qml	2016-03-14 15:06:51 +0000
@@ -0,0 +1,132 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2016 Canonical Ltd.
+ *
+ * Contact: Jonas G. Drange <[e-mail]>
+ *
+ * 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ */
+
+import QtQuick 2.4
+import SystemSettings 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Connectivity 1.0
+import Ubuntu.Settings.Vpn 0.1
+
+ItemPage {
+    id: root
+    title: i18n.tr("VPN")
+    objectName: "vpnPage"
+    flickable: scrollWidget
+
+    property var diag
+
+    function openConnection(connection, isNew) {
+        pageStack.push(vpnEditorDialog, {
+            "connection": connection,
+            "isNew": isNew
+        });
+    }
+
+    function previewConnection(connection) {
+        diag = PopupUtils.open(vpnPreviewDialog, root, {"connection": connection});
+    }
+
+    Flickable {
+        id: scrollWidget
+        anchors {
+            fill: parent
+            topMargin: units.gu(1)
+            bottomMargin: units.gu(1)
+        }
+        contentHeight: contentItem.childrenRect.height
+        boundsBehavior: (contentHeight > root.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+
+        Column {
+            anchors { left: parent.left; right: parent.right }
+
+            VpnList {
+                id: list
+                anchors { left: parent.left; right: parent.right }
+                model: Connectivity.vpnConnections
+
+                onClickedConnection: previewConnection(connection)
+            }
+
+            ListItem.Caption {
+                // We do not yet support configuration files.
+                visible: false
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                text : i18n.tr("To add a VPN configuration, download its config file or configure it manually.")
+            }
+
+            ListItem.SingleControl {
+                control: Button {
+                    objectName: "addVpnButton"
+                    text : i18n.tr("Add Manual Configuration…")
+                    onClicked: Connectivity.vpnConnections.add(VpnConnection.OPENVPN)
+                }
+            }
+        }
+    }
+
+    Component {
+        id: vpnEditorDialog
+        VpnEditor {
+            onTypeChanged: {
+                connection.remove();
+                pageStack.pop();
+                Connectivity.vpnConnections.add(type);
+            }
+            onReconnectionPrompt: PopupUtils.open(reconnPrompt)
+        }
+    }
+
+    Component {
+        id: vpnPreviewDialog
+        VpnPreviewDialog {
+            onChangeClicked: {
+                PopupUtils.close(diag);
+                openConnection(connection);
+            }
+        }
+    }
+
+    Component {
+        id: reconnPrompt
+        Dialog {
+            id: reconnPromptDiag
+            title: i18n.tr("VPN reconnection required.")
+            text: i18n.tr("You need to reconnect for changes to have an effect.")
+
+            ListItem.SingleControl {
+                control: Button {
+                    width: parent.width
+                    text : i18n.tr("OK")
+                    onClicked: PopupUtils.close(reconnPromptDiag);
+                }
+            }
+        }
+    }
+
+    Connections {
+        target: Connectivity.vpnConnections
+        onAddFinished: openConnection(connection, true)
+    }
+}

=== added file 'plugins/vpn/network-vpn.svg'
--- plugins/vpn/network-vpn.svg	1970-01-01 00:00:00 +0000
+++ plugins/vpn/network-vpn.svg	2016-03-14 15:06:51 +0000
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.91+devel r"
+   viewBox="0 0 96 96.000001"
+   sodipodi:docname="network-vpn.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.0249993"
+     inkscape:cx="-4.6192206"
+     inkscape:cy="58.206397"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4780"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="8" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="8,-8.0000001"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="4,-8.0000001"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,88.000001"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,92.000001"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="104,4"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-5,8.0000001"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="88,-8.0000001"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-8,84.000001"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="12,-8.0000001"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,-8.0000001"
+       id="guide4080" />
+    <sodipodi:guide
+       position="48,-8.0000001"
+       orientation="1,0"
+       id="guide4170" />
+    <sodipodi:guide
+       position="-8,48"
+       orientation="0,1"
+       id="guide4172" />
+    <sodipodi:guide
+       position="92,-8.0000001"
+       orientation="1,0"
+       id="guide4760" />
+    <sodipodi:guide
+       position="108,12"
+       orientation="0,1"
+       id="guide4182" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-78.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="next01.png"
+         transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)"
+         id="g4778"
+         inkscape:label="Layer 1">
+        <g
+           transform="matrix(-1,0,0,1,575.99999,611)"
+           id="g4780"
+           style="display:inline">
+          <rect
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
+             id="rect4782"
+             width="96.037987"
+             height="96"
+             x="-438.00244"
+             y="345.36221"
+             transform="scale(-1,1)" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079107;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 351.96875,357.36133 v 72 h 4 v -72 z"
+             id="path4205"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079155;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 353.96875,391.36133 v 4.00195 h 14.00586 v -4.00195 z"
+             id="path4207"
+             inkscape:connector-curvature="0" />
+          <ellipse
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079155;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:10.79999924;stroke-opacity:1;marker:none;enable-background:accumulate"
+             id="path4221"
+             cx="-393.36218"
+             cy="-353.96921"
+             transform="matrix(0,-1,-1,0,0,0)"
+             rx="5.9999971"
+             ry="6.0023708" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079155;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 427.9977,421.38592 c -0.0582,5.03278 0.12032,8.71362 -1.54162,11.72461 -0.83098,1.5055 -2.23647,2.69681 -3.99182,3.35547 -1.75535,0.65866 -3.83983,0.89649 -6.47131,0.89649 h -40.01582 c -2.63147,0 -4.71401,-0.23783 -6.46936,-0.89649 -1.75535,-0.65866 -3.16084,-1.84997 -3.99181,-3.35547 -1.66195,-3.01099 -1.48538,-6.69183 -1.54358,-11.72461 v -0.0117 -56.02344 -0.0117 c 0.0582,-5.03277 -0.11837,-8.71361 1.54358,-11.7246 0.83097,-1.5055 2.23646,-2.69681 3.99181,-3.35547 1.75535,-0.65867 3.83789,-0.89649 6.46936,-0.89649 h 40.01582 c 2.63148,0 4.71596,0.23782 6.47131,0.89649 1.75535,0.65866 3.16084,1.84997 3.99182,3.35547 1.66194,3.01099 1.48341,6.69183 1.54162,11.7246 v 0.0117 56.02344 z m -4.00158,-0.0234 v -56 c -0.0588,-5.03825 -0.23697,-8.35187 -1.04534,-9.8164 -0.40494,-0.73364 -0.85328,-1.15272 -1.89332,-1.54297 -1.04004,-0.39026 -2.694,-0.64063 -5.06451,-0.64063 h -40.01582 c -2.3705,0 -4.02447,0.25037 -5.06451,0.64063 -1.04003,0.39025 -1.48838,0.80933 -1.89332,1.54297 -0.80836,1.46453 -0.98656,4.77815 -1.04534,9.8164 v 55.97656 0.0234 c 0.0588,5.03826 0.23698,8.35188 1.04534,9.81641 0.40494,0.73364 0.85329,1.15076 1.89332,1.54102 1.04004,0.39025 2.69401,0.64257 5.06451,0.64257 h 40.01582 c 2.37051,0 4.02447,-0.25232 5.06451,-0.64257 1.04004,-0.39026 1.48838,-0.80738 1.89332,-1.54102 0.80837,-1.46453 0.98655,-4.77815 1.04534,-9.81641 z"
+             id="path4179"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccsssscccccccssccccccccccsscccccccsscccc" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079107;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 393.98438,374.6875 v 34.63281 h 4.00195 l -0.002,-34.63281 z"
+             id="path4122"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99999976;marker:none;enable-background:accumulate"
+             d="m 406.2305,378.32915 c 0,0 -3.98402,-9.64528 -10.24547,-19.0012 -6.26145,9.35592 -10.24546,19.0012 -10.24546,19.0012 l 10.24546,0.006 z"
+             id="path4215"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc"
+             inkscape:transform-center-x="9.596908"
+             inkscape:transform-center-y="-0.085309495" />
+          <path
+             inkscape:transform-center-y="-0.085309495"
+             inkscape:transform-center-x="-9.596908"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4216"
+             d="m 406.2305,408.33395 c 0,0 -3.98402,9.64528 -10.24547,19.0012 -6.26145,-9.35592 -10.24546,-19.0012 -10.24546,-19.0012 l 10.24546,-0.006 z"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99999976;marker:none;enable-background:accumulate" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'plugins/vpn/vpn.settings'
--- plugins/vpn/vpn.settings	1970-01-01 00:00:00 +0000
+++ plugins/vpn/vpn.settings	2016-03-14 15:06:51 +0000
@@ -0,0 +1,20 @@
+{
+    "icon": "network-vpn",
+    "name": "VPN",
+    "translations": "ubuntu-system-settings",
+    "category": "network",
+    "priority": 3,
+    "keywords": [
+        "network",
+        "connect",
+        "disconnect",
+        "vpn",
+        "openvpn",
+        "ip",
+        "address",
+        "routing"
+    ],
+    "has-dynamic-keywords": false,
+    "has-dynamic-visibility": false,
+    "page-component": "PageComponent.qml"
+}

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2015-10-20 14:46:24 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2016-03-14 15:06:51 +0000
@@ -120,6 +120,10 @@
     def go_to_datetime_page(self):
         return self._go_to_page('entryComponent-time-date', 'timeDatePage')
 
+    @autopilot.logging.log_action(logger.debug)
+    def go_to_vpn_page(self):
+        return self._go_to_page('entryComponent-vpn', 'vpnPage')
+
     def _go_to_page(self, item_object_name, page_object_name):
         self.click_item(item_object_name)
         page = self.wait_select_single(objectName=page_object_name)
@@ -1831,3 +1835,134 @@
     def _click_forget(self):
         button = self.select_single('Button', objectName='forgetNetwork')
         self.pointing_device.click_object(button)
+
+
+class VpnPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for the VPN page."""
+
+    @classmethod
+    def validate_dbus_object(cls, path, state):
+        name = introspection.get_classname_from_path(path)
+        if name == b'PageComponent':
+            if state['objectName'][1] == 'vpnPage':
+                return True
+        return False
+
+    @autopilot.logging.log_action(logger.debug)
+    def add_vpn(self):
+        obj = self.select_single(objectName='addVpnButton')
+        self.pointing_device.click_object(obj)
+        return self.get_root_instance().wait_select_single(
+            objectName='vpnEditor')
+
+    @autopilot.logging.log_action(logger.debug)
+    def preview_vpn(self, at):
+        obj = self.wait_select_single(objectName='vpnListConnection%d' % at)
+        self.pointing_device.click_object(obj)
+        return self.get_root_instance().wait_select_single(
+            objectName='vpnPreviewDialog')
+
+    @autopilot.logging.log_action(logger.debug)
+    def change_vpn(self, at):
+        diag = self.preview_vpn(at)
+        change_button = diag.wait_select_single(
+            objectName='vpnPreviewChangeButton'
+        )
+        self.pointing_device.click_object(change_button)
+        return self.get_root_instance().wait_select_single(
+            objectName='vpnEditor')
+
+
+class VpnEditor(
+    ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase
+):
+    """Autopilot helper for vpn change dialog."""
+
+    @property
+    def _openvpn_server_field(self):
+        return self.wait_select_single(
+            ubuntuuitoolkit.TextField,
+            objectName='vpnOpenvpnServerField')
+
+    @property
+    def _openvpn_port_field(self):
+        return self.wait_select_single(
+            ubuntuuitoolkit.TextField,
+            objectName='vpnOpenvpnPortField')
+
+    @property
+    def _openvpn_custom_port_toggle(self):
+        return self.wait_select_single(
+            ubuntuuitoolkit.CheckBox,
+            objectName='vpnOpenvpnCustomPortToggle')
+
+    @property
+    def _openvpn_tcp_toggle(self):
+        return self.wait_select_single(
+            ubuntuuitoolkit.CheckBox,
+            objectName='vpnOpenvpnTcpToggle')
+
+    @property
+    def _openvpn_udp_toggle(self):
+        return self.wait_select_single(
+            ubuntuuitoolkit.CheckBox,
+            objectName='vpnOpenvpnUdpToggle')
+
+    @property
+    def _openvpn_ca_field(self):
+        return self.wait_select_single(objectName='vpnOpenvpnCaField')
+
+    @property
+    def _openvpn_ok_button(self):
+        return self.wait_select_single(
+            'Button', objectName='vpnEditorOkayButton')
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_openvpn_server(self, server):
+        self._openvpn_server_field.write(server)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_openvpn_custom_port(self, port):
+        self._openvpn_custom_port_toggle.check()
+        # XXX: workaround for lp:1546559, i.e. we need to wait
+        # some time between writing to the API.
+        sleep(1)
+        self._openvpn_port_field.write(port)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_openvpn_ca(self, paths):
+        self.set_openvpn_file(self._openvpn_ca_field, paths)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_openvpn_file(self, field, paths):
+        self.pointing_device.click_object(field)
+
+        # Wait for expanded animation.
+        sleep(0.5)
+
+        # file = field.wait_select_single(objectName='vpnFileSelectorItem0')
+        choose = field.wait_select_single(objectName='vpnFileSelectorItem1')
+        self.pointing_device.click_object(choose)
+        file_dialog = self.get_root_instance().wait_select_single(
+            objectName='vpnDialogFile'
+        )
+
+        # Go to root /
+        root = file_dialog.wait_select_single(objectName='vpnFilePathItem_/')
+        self.pointing_device.click_object(root)
+
+        for path in paths:
+            list_view = file_dialog.wait_select_single(
+                'QQuickListView', objectName='vpnFileList'
+            )
+            list_view.click_element('vpnFileItem_%s' % path)
+        accept = file_dialog.wait_select_single(objectName='vpnFileAccept')
+        self.pointing_device.click_object(accept)
+
+    @autopilot.logging.log_action(logger.debug)
+    def openvpn_okay(self):
+        utils.dismiss_osk()
+        self.get_root_instance().main_view.scroll_to_and_click(
+            self._openvpn_ok_button
+        )

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-12-04 16:18:00 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2016-03-14 15:06:51 +0000
@@ -937,6 +937,67 @@
         super(LanguageBaseTestCase, self).tearDown()
 
 
+class UbuntuSystemSettingsVpnTestCase(UbuntuSystemSettingsTestCase,
+                                      dbusmock.DBusTestCase):
+    """Base class for tests that tests the vpn functionality."""
+    connectivity_parameters = {}
+    indicatornetwork_parameters = {}
+
+    @classmethod
+    def setUpClass(cls):
+        cls.session_con = cls.get_dbus(False)
+
+        cls.start_system_bus()
+
+        super(UbuntuSystemSettingsVpnTestCase, cls).setUpClass()
+
+    def setUp(self):
+        if is_process_running(INDICATOR_NETWORK):
+            _stop_process(INDICATOR_NETWORK)
+            self.addCleanup(_start_process, INDICATOR_NETWORK)
+
+        ctv_tmpl = os.path.join(os.path.dirname(__file__), 'connectivity.py')
+        (self.ctv_mock, self.obj_ctv) = self.spawn_server_template(
+            ctv_tmpl, parameters=self.connectivity_parameters,
+            stdout=subprocess.PIPE)
+
+        self.ctv_private = dbus.Interface(
+            self.session_con.get_object(CTV_IFACE, CTV_PRIV_OBJ),
+            'org.freedesktop.DBus.Properties')
+
+        super(UbuntuSystemSettingsVpnTestCase, self).setUp()
+
+    def tearDown(self):
+        self.ctv_mock.terminate()
+        self.ctv_mock.wait()
+        super(UbuntuSystemSettingsVpnTestCase, self).tearDown()
+
+    @classmethod
+    def tearDownClass(cls):
+        if dbusmock.DBusTestCase.system_bus_pid is not None:
+            cls.stop_dbus(dbusmock.DBusTestCase.system_bus_pid)
+            del os.environ['DBUS_SYSTEM_BUS_ADDRESS']
+            dbusmock.DBusTestCase.system_bus_pid = None
+        if dbusmock.DBusTestCase.session_bus_pid is not None:
+            cls.stop_dbus(dbusmock.DBusTestCase.session_bus_pid)
+            del os.environ['DBUS_SESSION_BUS_ADDRESS']
+            dbusmock.DBusTestCase.session_bus_pid = None
+        super(UbuntuSystemSettingsVpnTestCase, cls).tearDownClass()
+
+
+class VpnBaseTestCase(UbuntuSystemSettingsVpnTestCase):
+
+    def setUp(self):
+        super(VpnBaseTestCase, self).setUp()
+        self.vpn_page = self.main_view.go_to_vpn_page()
+
+    def get_vpn_connection_object(self, path):
+        return dbus.Interface(
+            self.session_con.get_object(CTV_IFACE, path),
+            'org.freedesktop.DBus.Properties'
+        )
+
+
 class WifiBaseTestCase(UbuntuSystemSettingsTestCase,
                        dbusmock.DBusTestCase):
     """ Base class for wifi settings tests"""

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/connectivity.py'
--- tests/autopilot/ubuntu_system_settings/tests/connectivity.py	2015-09-15 17:39:23 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/connectivity.py	2016-03-14 15:06:51 +0000
@@ -24,6 +24,11 @@
 NETS_IFACE = 'com.ubuntu.connectivity1.NetworkingStatus'
 NETS_OBJ = '/com/ubuntu/connectivity1/NetworkingStatus'
 
+VPN_OBJ = '/com/ubuntu/connectivity1/vpn'
+VPN_CONN_IFACE = 'com.ubuntu.connectivity1.vpn.VpnConnection'
+VPN_CONN_OPENVPN_IFACE = 'com.ubuntu.connectivity1.vpn.VpnConnection.OpenVpn'
+VPN_CONN_PPTP_IFACE = 'com.ubuntu.connectivity1.vpn.VpnConnection.Pptp'
+
 NOT_IMPLEMENTED = '''raise dbus.exceptions.DBusException(
     "org.ofono.Error.NotImplemented")'''
 
@@ -55,6 +60,117 @@
     self.SetProperty(NETS_OBJ, NETS_IFACE, 'WifiEnabled', value)
 
 
+def add_openvpn_object(mock, path):
+    obj = dbusmock.get_object(path)
+    obj.AddProperties(VPN_CONN_OPENVPN_IFACE, {
+        'connectionType': dbus.UInt32(0),
+        'remote': dbus.String(),
+        'ca': dbus.String(),
+        'cert': dbus.String(),
+        'certPass': dbus.String(),
+        'key': dbus.String(),
+        'username': dbus.String(),
+        'password': dbus.String(),
+        'localIp': dbus.String(),
+        'remoteIp': dbus.String(),
+        'staticKey': dbus.String(),
+        'staticKeyDirection': dbus.UInt32(0),
+        'portSet': dbus.Boolean(False),
+        'port': dbus.UInt32(1194),
+        'renegSecondsSet': dbus.Boolean(False),
+        'renegSeconds': dbus.UInt32(0),
+        'compLzo': dbus.Boolean(False),
+        'protoTcp': dbus.Boolean(False),
+        'devTypeSet': dbus.Boolean(False),
+        'devType': dbus.UInt32(0),
+        'dev': dbus.String(),
+        'tunnelMtuSet': dbus.Boolean(False),
+        'tunnelMtu': dbus.UInt32(1500),
+        'fragmentSizeSet': dbus.Boolean(False),
+        'fragmentSize': dbus.UInt32(1300),
+        'mssFix': dbus.Boolean(False),
+        'remoteRandom': dbus.Boolean(False),
+        'cipher': dbus.UInt32(0),
+        'keysizeSet': dbus.Boolean(False),
+        'keysize': dbus.UInt32(128),
+        'auth': dbus.UInt32(0),
+        'tlsRemote': dbus.String(),
+        'remoteCertTlsSet': dbus.Boolean(False),
+        'remoteCertTls': dbus.UInt32(0),
+        'taSet': dbus.Boolean(False),
+        'ta': dbus.String(),
+        'taDir': dbus.UInt32(0),
+        'proxyType': dbus.UInt32(),
+        'proxyServer': dbus.String(),
+        'proxyPort': dbus.UInt32(80),
+        'proxyRetry': dbus.Boolean(False),
+        'proxyUsername': dbus.String(),
+        'proxyPassword': dbus.String(),
+    })
+
+
+def add_pptp_object(mock, path):
+    obj = dbusmock.get_object(path)
+    obj.AddProperties(VPN_CONN_PPTP_IFACE, {
+        'gateway': dbus.String(),
+        'user': dbus.String(),
+        'password': dbus.String(),
+        'domain': dbus.String(),
+        'allowPap': dbus.Boolean(True),
+        'allowChap': dbus.Boolean(True),
+        'allowMschap': dbus.Boolean(True),
+        'allowMschapv2': dbus.Boolean(True),
+        'allowEap': dbus.Boolean(True),
+        'requireMppe': dbus.Boolean(False),
+        'mppeType': dbus.UInt32(0),
+        'mppeStateful': dbus.Boolean(False),
+        'bsdCompression': dbus.Boolean(True),
+        'deflateCompression': dbus.Boolean(True),
+        'tcpHeaderCompression': dbus.Boolean(True),
+        'sendPppEchoPackets': dbus.Boolean(False),
+    })
+
+
+def add_vpn_object(mock, vpn_type, path):
+    mock.AddObject(
+        path,
+        VPN_CONN_IFACE,
+        {
+            'activatable': dbus.Boolean(True),
+            'active': dbus.Boolean(False),
+            'type': dbus.UInt32(vpn_type),
+            'id': path.split('/')[len(path.split('/'))-1]
+        },
+        [
+            ('UpdateSecrets', '', '', ''),
+        ]
+    )
+
+    if vpn_type == 0:
+        add_openvpn_object(mock, path)
+    elif vpn_type == 1:
+        add_pptp_object(mock, path)
+    else:
+        raise Exception("Unable to add vpn connection, no such type: %d" % (
+            vpn_type)
+        )
+
+
+def add_vpn_connection(mock, vpn_type):
+    conns = mock.Get(PRIV_IFACE, 'VpnConnections')
+    new_path = '%s/%s%s' % (VPN_OBJ, 'MockVpnConnection', str(len(conns)))
+    add_vpn_object(mock, vpn_type, new_path)
+    conns.append(new_path)
+    mock.SetProperty(PRIV_OBJ, PRIV_IFACE, 'VpnConnections', conns)
+    return new_path
+
+
+def remove_vpn_connection(mock, path):
+    conns = mock.Get(PRIV_IFACE, 'VpnConnections')
+    conns.remove(path)
+    mock.SetProperty(PRIV_OBJ, PRIV_IFACE, 'VpnConnections', conns)
+
+
 def load(mock, parameters):
     global _parameters
     _parameters = parameters
@@ -64,6 +180,8 @@
     mock.set_hotspot_password = set_hotspot_password
     mock.set_wifi_enabled = set_wifi_enabled
     mock.set_hotspot_auth = set_hotspot_auth
+    mock.add_vpn_connection = add_vpn_connection
+    mock.remove_vpn_connection = remove_vpn_connection
 
     mock.AddObject(
         NETS_OBJ,
@@ -106,7 +224,9 @@
             ),
             'HotspotAuth': _parameters.get(
                 'HotspotAuth', dbus.String('wpa-psk')
-            )
+            ),
+            'VpnConnections': _parameters.get('VpnConnections',
+                                              dbus.Array([], signature='o'))
         },
         [
             (
@@ -144,6 +264,14 @@
             (
                 'SetHotspotMode', 's', '',
                 ''
+            ),
+            (
+                'AddVpnConnection', 'u', 'o',
+                'ret = objects["/"].add_vpn_connection(self, args[0])'
+            ),
+            (
+                'RemoveVpnConnection', 'o', '',
+                'objects["/"].remove_vpn_connection(self, args[0])'
             )
         ]
     )

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_plugins.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_plugins.py	2015-09-16 14:28:40 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_plugins.py	2016-03-14 15:06:51 +0000
@@ -137,6 +137,13 @@
         )
         self.assertThat(plugin, NotEquals(None))
 
+    def test_vpn(self):
+        """ Checks whether the Vpn plugin is available """
+        plugin = self.main_view.select_single(
+            objectName='entryComponent-vpn'
+        )
+        self.assertThat(plugin, NotEquals(None))
+
 
 class SystemSettingsUpowerTestCases(UbuntuSystemSettingsUpowerTestCase):
     def setUp(self):

=== added file 'tests/autopilot/ubuntu_system_settings/tests/test_vpn.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_vpn.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_vpn.py	2016-03-14 15:06:51 +0000
@@ -0,0 +1,61 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2014 Canonical
+#
+# 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.
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+
+from ubuntu_system_settings.tests import VpnBaseTestCase
+
+from ubuntu_system_settings.tests.connectivity import (
+    PRIV_IFACE as CTV_PRIV_IFACE, VPN_CONN_OPENVPN_IFACE
+)
+
+
+class VpnAddTestCase(VpnBaseTestCase):
+
+    connectivity_parameters = {}
+
+    def test_add_and_configure_openvpn(self):
+        page = self.vpn_page.add_vpn()
+
+        # Wait for length of VpnConnections to become 1
+        self.assertThat(
+            lambda: len(
+                self.ctv_private.Get(CTV_PRIV_IFACE, 'VpnConnections')
+            ),
+            Eventually(Equals(1))
+        )
+        conn_path = self.ctv_private.Get(CTV_PRIV_IFACE, 'VpnConnections')[0]
+        conn_obj = self.get_vpn_connection_object(conn_path)
+
+        page.set_openvpn_server('vpn.ubuntu.com')
+        page.set_openvpn_custom_port('1000')
+
+        page.set_openvpn_ca(
+            # Any file will do.
+            ['etc', 'apt', 'sources.list']
+        )
+        page.openvpn_okay()
+
+        self.assertThat(
+            lambda: conn_obj.Get(VPN_CONN_OPENVPN_IFACE, 'remote'),
+            Eventually(Equals('vpn.ubuntu.com'))
+        )
+
+        self.assertThat(
+            lambda: conn_obj.Get(VPN_CONN_OPENVPN_IFACE, 'ca'),
+            Eventually(Equals('/etc/apt/sources.list'))
+        )
+
+        self.assertThat(
+            lambda: conn_obj.Get(VPN_CONN_OPENVPN_IFACE, 'portSet'),
+            Eventually(Equals(True))
+        )
+        self.assertThat(
+            lambda: conn_obj.Get(VPN_CONN_OPENVPN_IFACE, 'port'),
+            Eventually(Equals(1000))
+        )