cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [11/28] git commit: updated refs/heads/master to 75b68c6
Date Sat, 16 Jan 2016 18:55:18 GMT
[MARVIN] Add forceencap field to VpnCustomerGateway class in marvin base


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0b54871f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0b54871f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0b54871f

Branch: refs/heads/master
Commit: 0b54871fa3273219910a573fef5e22ce7ac4caaa
Parents: 6da3bc1
Author: Michael Andersen <mandersen@schubergphilis.com>
Authored: Wed Dec 23 21:13:40 2015 +0100
Committer: Michael Andersen <mandersen@schubergphilis.com>
Committed: Thu Jan 7 19:27:42 2016 +0100

----------------------------------------------------------------------
 tools/marvin/marvin/lib/base.py | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b54871f/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index ab15a78..4e04ba8 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -3572,6 +3572,8 @@ class VpnCustomerGateway:
             cmd.esplifetime = services["esplifetime"]
         if "dpd" in services:
             cmd.dpd = services["dpd"]
+        if "forceencap" in services:
+            cmd.forceencap = services["forceencap"]
         if account:
             cmd.account = account
         if domainid:
@@ -3599,6 +3601,8 @@ class VpnCustomerGateway:
             cmd.esplifetime = services["esplifetime"]
         if "dpd" in services:
             cmd.dpd = services["dpd"]
+        if "forceencap" in services:
+            cmd.forceencap = services["forceencap"]
         return(apiclient.updateVpnCustomerGateway(cmd))
 
     def delete(self, apiclient):


Mime
View raw message