You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/11/18 09:50:36 UTC
[29/50] [abbrv] git commit: updated refs/heads/marvin_refactor to
b784012
marvin_refactor: data for networkoffering
use the random_gen for the name /displaytext of the offering
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0fdc4e25
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0fdc4e25
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0fdc4e25
Branch: refs/heads/marvin_refactor
Commit: 0fdc4e25bc4fa36758fb9f34cc835680f0e8d505
Parents: 4268f24
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Sep 13 15:55:47 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Thu Oct 31 13:54:24 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/factory/data/networkoffering.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0fdc4e25/tools/marvin/marvin/factory/data/networkoffering.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/factory/data/networkoffering.py b/tools/marvin/marvin/factory/data/networkoffering.py
index 41cda56..5b64cf6 100644
--- a/tools/marvin/marvin/factory/data/networkoffering.py
+++ b/tools/marvin/marvin/factory/data/networkoffering.py
@@ -86,11 +86,10 @@ class DefaultSharedNetworkOfferingWithSGServiceFactory(NetworkOfferingFactory):
self.update(apiclient=self.apiclient, id=self.id, state='Enabled')
-
class DefaultSharedNetworkOfferingFactory(NetworkOfferingFactory):
- displaytext = factory.Sequence(lambda n : "DefaultSharedNetworkOfferingFactory-%d" % n)
- name = factory.Sequence(lambda n : "DefaultSharedNetworkOfferingFactory-%d" % n)
+ displaytext = factory.Sequence(lambda n : "DefaultSharedNetworkOfferingFactory-%s" % random_gen())
+ name = factory.Sequence(lambda n : "DefaultSharedNetworkOfferingFactory-%s" % random_gen())
availability = "Optional"
supportedservices = "Dns,Dhcp,UserData"
guestiptype = "Shared"