cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject git commit: updated refs/heads/master to e16ab59
Date Mon, 01 Sep 2014 08:26:33 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 623205a65 -> e16ab59c5


CLOUDSTACK-7452: Removing test_data.cfg file as it is no longer in use


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

Branch: refs/heads/master
Commit: e16ab59c582f62f280d8caad529fdf1fa5f9d2a9
Parents: 623205a
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Thu Aug 28 13:57:17 2014 +0530
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Mon Sep 1 13:56:02 2014 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/config/test_data.cfg | 427 --------------------------
 1 file changed, 427 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e16ab59c/tools/marvin/marvin/config/test_data.cfg
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.cfg b/tools/marvin/marvin/config/test_data.cfg
deleted file mode 100644
index 5a3d8aa..0000000
--- a/tools/marvin/marvin/config/test_data.cfg
+++ /dev/null
@@ -1,427 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-{
-        "region": {
-                "regionid": "2",
-                "regionname": "Region2",
-                "regionendpoint": "http://region2:8080/client"
-        },
-        "zone": "NA",
-        
-        "domain": { "name": "domain" },
-        
-        "project": {
-            "name": "Project",
-            "displaytext": "Test project"
-        },
-        "account": {
-            "email": "test-account@test.com",
-            "firstname": "test",
-            "lastname": "test",
-            "username": "test-account",
-            "password": "password"
-        }, 
-        "small": {
-            "displayname": "testserver",
-            "username": "root", 
-            "password": "password",
-            "ssh_port": 22,
-            "hypervisor": "XenServer",
-            "privateport": 22,
-            "publicport": 22,
-            "protocol": 'TCP',
-        },
-        "medium": {
-            "displayname": "testserver",
-            "username": "root",
-            "password": "password",
-            "ssh_port": 22,
-            "hypervisor": 'XenServer',
-            "privateport": 22,
-            "publicport": 22,
-            "protocol": 'TCP',
-        },
-        "service_offerings": {
-            "name": "Tiny Instance",
-            "displaytext": "Tiny Instance",
-            "cpunumber": 1,
-            "cpuspeed": 100,
-            "memory": 128,
-            
-            "tiny": {
-                "name": "Tiny Instance",
-                "displaytext": "Tiny Instance",
-                "cpunumber": 1,
-                "cpuspeed": 100, 
-                "memory": 128, 
-            },   
-            "small": {
-                "name": "Small Instance",
-                "displaytext": "Small Instance",
-                "cpunumber": 1,
-                "cpuspeed": 100,
-                "memory": 256 
-            },
-            "medium": {
-                "name": "Medium Instance",
-                "displaytext": "Medium Instance",
-                "cpunumber": 1,
-                "cpuspeed": 100,
-                "memory": 256,
-            },
-            "big": {
-                "name": "BigInstance",
-                "displaytext": "BigInstance",
-                "cpunumber": 1,
-                "cpuspeed": 100,
-                "memory": 512,
-            }
-        },
-        "disk_offering": {
-            "name": "Disk offering",
-            "displaytext": "Disk offering",
-            "disksize": 1  
-        },
-        'resized_disk_offering': {
-            "displaytext": "Resized",
-            "name": "Resized",
-            "disksize": 3
-        },
-        "network": {
-            "name": "Test Network",
-            "displaytext": "Test Network",
-            "acltype": "Account",
-        },
-        "network2": {
-            "name": "Test Network Shared",
-            "displaytext": "Test Network Shared",
-            "vlan" :1201,
-            "gateway" :"172.16.15.1",
-            "netmask" :"255.255.255.0",
-            "startip" :"172.16.15.21",
-            "endip" :"172.16.15.41",
-            "acltype": "Account",
-        },
-        "network_offering": {
-            "name": 'Test Network offering',
-            "displaytext": 'Test Network offering',
-            "guestiptype": 'Isolated',
-            "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding',
-            "traffictype": 'GUEST',
-            "availability": 'Optional',
-            "serviceProviderList" : {
-                "Dhcp": 'VirtualRouter',
-                "Dns": 'VirtualRouter',
-                "SourceNat": 'VirtualRouter',
-                "PortForwarding": 'VirtualRouter',
-            },
-        },
-        "isolated_network_offering": {
-            "name": "Network offering-DA services",
-            "displaytext": "Network offering-DA services",
-            "guestiptype": "Isolated",
-            "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat",
-            "traffictype": "GUEST",
-            "availability": "Optional'",
-            "serviceProviderList": {
-                "Dhcp": "VirtualRouter",
-                "Dns": "VirtualRouter",
-                "SourceNat": "VirtualRouter",
-                "PortForwarding": "VirtualRouter",
-                "Vpn": "VirtualRouter",
-                "Firewall": "VirtualRouter",
-                "Lb": "VirtualRouter",
-                "UserData": "VirtualRouter",
-                "StaticNat": "VirtualRouter"
-            }
-        },
-        "isolated_network": {
-            "name": "Isolated Network",
-            "displaytext": "Isolated Network"
-        },
-        "virtual_machine": {
-            "displayname": "Test VM",
-            "username": "root",
-            "password": "password",
-            "ssh_port": 22,
-            "privateport": 22,
-            "publicport": 22,
-            "protocol": "TCP",
-            "affinity": {
-                "name": "webvms",
-                "type": "host anti-affinity",
-            },
-        },
-        "server_without_disk": {
-            "displayname": "Test VM-No Disk",
-            "username": "root",
-            "password": "password",
-            "ssh_port": 22,
-            "hypervisor": 'XenServer',
-            "privateport": 22,
-            "publicport": 22,
-            "protocol": 'TCP',
-        },
-        "shared_network": {
-            "name": "MySharedNetwork - Test",
-            "displaytext": "MySharedNetwork",
-            "vlan" : "",
-            "gateway" :"",
-            "netmask" :"",
-            "startip" :"",
-            "endip" :"",
-            "acltype" : "Domain",
-            "scope":"all"
-        },
-        "shared_network_offering_sg": {
-            "name": "MySharedOffering-sg",
-            "displaytext": "MySharedOffering-sg",
-            "guestiptype": "Shared",
-            "supportedservices": "Dhcp,Dns,UserData,SecurityGroup",
-            "specifyVlan" : "False",
-            "specifyIpRanges" : "False",
-            "traffictype": "GUEST",
-            "serviceProviderList" : {
-                "Dhcp": "VirtualRouter",
-                "Dns": "VirtualRouter",
-                "UserData": "VirtualRouter",
-                "SecurityGroup": "SecurityGroupProvider"
-            }
-        },
-        "shared_network_sg": {
-            "name": "Shared-Network-SG-Test",
-            "displaytext": "Shared-Network_SG-Test",
-            "networkofferingid":"1",
-            "vlan" : "",
-            "gateway" :"",
-            "netmask" :"255.255.255.0",
-            "startip" :"",
-            "endip" :"",
-            "acltype" : "Domain",
-            "scope":"all"
-        },
-        "vpc_offering": {
-            "name": "VPC off",
-            "displaytext": "VPC off",
-            "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat,NetworkACL"
-        },
-        "vpc": {
-            "name": "TestVPC",
-            "displaytext": "TestVPC",
-            "cidr": "10.0.0.1/24"
-        },
-        "clusters": {
-            0: {
-                "clustername": "Xen Cluster",
-                "clustertype": "CloudManaged",
-                "hypervisor": "XenServer",
-            },
-            1: {
-                "clustername": "KVM Cluster",
-                "clustertype": "CloudManaged",
-                "hypervisor": "KVM",
-            },
-            2: {
-                "hypervisor": 'VMware',
-                "clustertype": 'ExternalManaged',
-                "username": 'administrator',
-                "password": 'fr3sca',
-                "url": 'http://192.168.100.17/CloudStack-Clogeny-Pune/Pune-1',
-                "clustername": 'VMWare Cluster',
-            },
-        },
-        "hosts": {
-            "xenserver": {
-                "hypervisor": 'XenServer',
-                "clustertype": 'CloudManaged',
-                "url": 'http://192.168.100.211',
-                "username": "root",
-                "password": "fr3sca",
-            },
-            "kvm": {
-                "hypervisor": 'KVM',
-                "clustertype": 'CloudManaged',
-                "url": 'http://192.168.100.212',
-                "username": "root",
-                "password": "fr3sca",
-            },
-            "vmware": {
-                "hypervisor": 'VMware',
-                "clustertype": 'ExternalManaged',
-                "url": 'http://192.168.100.203',
-                "username": "administrator",
-                "password": "fr3sca",
-            },
-        },
-        "network_offering_shared": {
-            "name": 'Test Network offering shared',
-            "displaytext": 'Test Network offering Shared',
-            "guestiptype": 'Shared',
-            "supportedservices": 'Dhcp,Dns,UserData',
-            "traffictype": 'GUEST',
-            "specifyVlan" : "True",
-            "specifyIpRanges" : "True",
-            "serviceProviderList" : {
-                "Dhcp": 'VirtualRouter',
-                "Dns": 'VirtualRouter',
-                "UserData": 'VirtualRouter',
-            },
-        },        
-        "network_offering_internal_lb": {
-            "name": "Network offering for internal lb service",
-            "displaytext": "Network offering for internal lb service",
-            "guestiptype": "Isolated",
-            "traffictype": "Guest",
-            "supportedservices": "Vpn,Dhcp,Dns,Lb,UserData,SourceNat,StaticNat,PortForwarding,NetworkACL",
-            "serviceProviderList": {
-                "Dhcp": "VpcVirtualRouter",
-                "Dns": "VpcVirtualRouter",
-                "Vpn": "VpcVirtualRouter",
-                "UserData": "VpcVirtualRouter",
-                "Lb": "InternalLbVM",
-                "SourceNat": "VpcVirtualRouter",
-                "StaticNat": "VpcVirtualRouter",
-                "PortForwarding": "VpcVirtualRouter",
-                "NetworkACL": "VpcVirtualRouter",
-            },
-            "serviceCapabilityList": {
-                "SourceNat": {"SupportedSourceNatTypes": "peraccount"},
-                "Lb": {"lbSchemes": "internal", "SupportedLbIsolation": "dedicated"}
-            }
-        },
-
-        "natrule": {
-            "privateport": 22,
-            "publicport": 2222,
-            "protocol": "TCP"
-        },
-        "lbrule": {
-            "name": "SSH",
-            "alg": "roundrobin",
-            "privateport": 22,
-            "publicport": 2222,
-            "protocol": 'TCP'
-        },
-
-        "iso1": {
-            "displaytext": "Test ISO 1",
-            "name": "ISO 1",
-            "url": "http://people.apache.org/~tsp/dummy.iso",
-            "isextractable": True,
-            "isfeatured": True,
-            "ispublic": True,
-            "ostype": "CentOS 5.3 (64-bit)",
-        },
-        "iso2": {
-            "displaytext": "Test ISO 2",
-            "name": "ISO 2",
-            "url": "http://people.apache.org/~tsp/dummy.iso",
-            "isextractable": True,
-            "isfeatured": True,
-            "ispublic": True,
-            "ostype": "CentOS 5.3 (64-bit)",
-            "mode": 'HTTP_DOWNLOAD',
-        },
-        "isfeatured": True,
-        "ispublic": True,
-        "isextractable": True,
-        "bootable": True, 
-        "passwordenabled": True,
-        
-        "template": {
-            "displaytext": "xs",
-            "name": "xs",
-            "passwordenabled": False,
-        },
-        "template_2": {
-            "displaytext": "Public Template",
-            "name": "Public template",
-            "ostype": "CentOS 5.3 (64-bit)",
-            "isfeatured": True,
-            "ispublic": True,
-            "isextractable": True,
-            "mode": "HTTP_DOWNLOAD",
-        },
-        "templatefilter": 'self',
-
-        "security_group" : { "name": "custom_Sec_Grp" },
-        "ingress_rule": {
-            "protocol": "TCP",
-            "startport": "22",
-            "endport": "22",
-            "cidrlist": "0.0.0.0/0"
-        },
-        "ostype": "CentOS 5.3 (64-bit)",
-        "sleep": 90,
-        "timeout": 10,
-        "advanced_sg": {
-            "zone": {
-                "name": "",
-                "dns1": "8.8.8.8",
-                "internaldns1": "192.168.100.1",
-                "networktype": "Advanced",
-                "securitygroupenabled": "true"
-            },
-            "securitygroupenabled": "true"
-        },
-        "vlan": {
-            "part": ["4090-4091", "4092-4095"],
-            "full": "4090-4095",
-        },
-        "nfs": {
-            "url": "nfs://10.147.28.7/export/home/talluri/testprimary",
-            "name": "Primary XEN"
-        },
-        "iscsi": {
-            "url": "iscsi://192.168.100.21/iqn.2012-01.localdomain.clo-cstack-cos6:iser/1",
-            "name": "Primary iSCSI"
-        },
-        "volume": {"diskname": "Test Volume"},
-        "volume_offerings": {
-            0: {"diskname": "TestDiskServ"},
-        },
-        "diskdevice": ['/dev/vdc',  '/dev/vdb', '/dev/hdb', '/dev/hdc', '/dev/xvdd', '/dev/cdrom',
'/dev/sr0',  '/dev/cdrom1' ],
-        
-        #test_vpc_vpn.py
-        "vpn_user": {
-            "username": "test",
-            "password": "password",
-        },
-        "vpc": {
-            "name": "vpc_vpn",
-            "displaytext": "vpc-vpn",
-            "cidr": "10.1.1.0/24"
-        },
-        "ntwk": {
-            "name": "tier1",
-            "displaytext": "vpc-tier1",
-            "gateway" : "10.1.1.1",
-            "netmask" : "255.255.255.192"
-        },
-        "vpc2": {
-            "name": "vpc2_vpn",
-            "displaytext": "vpc2-vpn",
-            "cidr": "10.2.1.0/24"
-        },
-        "ntwk2": {
-            "name": "tier2",
-            "displaytext": "vpc-tier2",
-            "gateway" : "10.2.1.1",
-            "netmask" : "255.255.255.192"
-        }
-}


Mime
View raw message