Skip to content

Commit 2f46153

Browse files
author
jojimt
authored
Merge pull request #555 from gaurav-dalvi/Merge0811
Functionality for JSON input and Swarm on Vagrant and Baremetal
2 parents a17b09b + f827cea commit 2f46153

22 files changed

+1953
-855
lines changed

‎Makefile

+6-3
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,9 @@ k8s-test:
119119
#make ssh-build
120120
cd vagrant/k8s/ && CONTIV_K8=1 vagrant ssh k8master -c 'sudo -i bash -lc "cd /opt/gopath/src/github.com/contiv/netplugin && make run-build"'
121121
CONTIV_K8=1 cd vagrant/k8s/ && ./start_sanity_service.sh
122-
CONTIV_K8=1 CONTIV_NODES=3 go test -v -timeout 540m ./test/systemtests -check.v -check.f "00SSH|Basic|Network|Policy|TestTrigger|ACIM|HostBridge|Netprofile"
123-
cd vagrant/k8s && vagrant destroy -f
122+
cd $(GOPATH)/src/github.com/contiv/netplugin/scripts/python && PYTHONIOENCODING=utf-8 ./createcfg.py -scheduler 'k8'
123+
CONTIV_K8=1 CONTIV_NODES=3 go test -v -timeout 540m ./test/systemtests -check.v -check.f "00SSH|Basic|Network|Policy|TestTrigger|ACIM|HostBridge|Netprofile"
124+
cd vagrant/k8s && vagrant destroy -f
124125
# Mesos demo targets
125126
mesos-docker-demo:
126127
cd vagrant/mesos-docker && vagrant up
@@ -172,13 +173,15 @@ ubuntu-tests:
172173
CONTIV_NODE_OS=ubuntu make clean build unit-test system-test stop
173174

174175
system-test:start
176+
cd $(GOPATH)/src/github.com/contiv/netplugin/scripts/python && PYTHONIOENCODING=utf-8 ./createcfg.py
175177
go test -v -timeout 480m ./test/systemtests -check.v -check.f "00SSH|Basic|Network|Policy|TestTrigger|ACIM|Netprofile"
176178

177179
l3-test:
178180
CONTIV_L3=2 CONTIV_NODES=3 make stop
179181
CONTIV_L3=2 CONTIV_NODES=3 make start
180182
CONTIV_L3=2 CONTIV_NODES=3 make ssh-build
181-
CONTIV_L3=2 CONTIV_NODES=3 go test -v -timeout 720m ./test/systemtests -check.v
183+
cd $(GOPATH)/src/github.com/contiv/netplugin/scripts/python && PYTHONIOENCODING=utf-8 ./createcfg.py -contiv_l3 2
184+
CONTIV_L3=2 CONTIV_NODES=3 go test -v -timeout 720m ./test/systemtests -check.v
182185
CONTIV_L3=2 CONTIV_NODES=3 make stop
183186
l3-demo:
184187
CONTIV_L3=1 CONTIV_NODES=3 vagrant up

‎scripts/python/createcfg.py

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
#!/usr/bin/python
2+
# script to create the config JSON input for the system tests
3+
import os
4+
import json
5+
import argparse
6+
7+
parser = argparse.ArgumentParser()
8+
parser.add_argument("-scheduler", default='docker', help="Scheduler used, if any")
9+
parser.add_argument("-swarm_var", default='', help="Swarm host variable")
10+
parser.add_argument("-platform", default='vagrant', help="Vagrant/baremetal")
11+
parser.add_argument("-product", default='netplugin', help="netplugin/volplugin")
12+
parser.add_argument("-contiv_l3", default=0, help="Running in L3 mode")
13+
parser.add_argument("-key_file", default="/home/admin/.ssh/id_rsa", help="file path of key_file")
14+
parser.add_argument("-binpath", default="/opt/gopath/bin", help="GOBIN path")
15+
parser.add_argument("-hostips", default="192.168.2.10,192.168.2.11,192.168.2.12", help="Host IPs in the system")
16+
parser.add_argument("-hostnames", default="admin,admin,admin", help="Usernames on the hosts")
17+
18+
parser.add_argument("-aci_mode", default='off', help="Running in ACI mode")
19+
parser.add_argument("-short", default=False, help="Shorter version of system tests")
20+
parser.add_argument("-containers", default=3, help="Number of containers for each test")
21+
parser.add_argument("-iterations", default=3, help="Number of iterations for each test")
22+
parser.add_argument("-enableDNS", default=False, help="Enabling DNS")
23+
parser.add_argument("-contiv_cluster_store", default="etcd://localhost:2379", help="cluster info")
24+
parser.add_argument("-datainterface", default="eth2", help="Data interface")
25+
parser.add_argument("-mgmtinterface", default="eth1", help="Control interface")
26+
parser.add_argument("-vlan", default="1120-1150", help="vlan range")
27+
parser.add_argument("-vxlan", default="1-10000", help="vxlan range")
28+
parser.add_argument("-subnet", default="10.1.1.0/24", help="subnet for ACI testing")
29+
parser.add_argument("-gateway", default="10.1.1.254", help="gateway for ACI testing")
30+
parser.add_argument("-network", default="TestNet", help="network name for ACI testing")
31+
parser.add_argument("-tenant", default="TestTenant", help="tenant name for ACI testing")
32+
parser.add_argument("-encap", default="vlan", help="encapsulation for ACI testing")
33+
34+
args = parser.parse_args()
35+
data = {}
36+
data['scheduler'] = args.scheduler
37+
data['swarm_variable'] = args.swarm_var
38+
data['platform'] = args.platform
39+
data['product'] = args.product
40+
data['aci_mode'] = args.aci_mode
41+
data['short'] = args.short
42+
data['containers'] = args.containers
43+
data['iterations'] = args.iterations
44+
data['enableDNS'] = args.enableDNS
45+
data['contiv_cluster_store'] = args.contiv_cluster_store
46+
data['contiv_l3'] = args.contiv_l3
47+
data['key_file'] = args.key_file
48+
data['binpath'] = args.binpath
49+
data['hostips'] = args.hostips
50+
data['hostusernames'] = args.hostnames
51+
data['dataInterface'] = args.datainterface
52+
data['mgmtInterface'] = args.mgmtinterface
53+
data['vlan'] = args.vlan
54+
data['vxlan'] = args.vxlan
55+
data['subnet'] = args.subnet
56+
data['gateway'] = args.gateway
57+
data['network'] = args.network
58+
data['tenant'] = args.tenant
59+
data['encap'] = args.encap
60+
61+
filepath = os.environ['GOPATH'] + '/src/github.com/contiv/netplugin/test/systemtests/cfg.json'
62+
with open(filepath, 'w') as outfile:
63+
print "Generating the config file: " + filepath
64+
json.dump(data, outfile)
65+
66+
os._exit(0)

‎test/systemtests/ACI-Automation-README.md

-85
This file was deleted.

‎test/systemtests/How-to-Run.md

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
Current framework can run system-tests for
2+
3+
```
4+
Vagrant-
5+
Docker -- Non-ACI
6+
Swarm -- Non-ACI
7+
8+
Baremetal-
9+
Swarm -- ACI
10+
Swarm -- Non-ACI
11+
```
12+
A guide to running netplugin systemtests on Vagrant and Baremetal platforms:
13+
14+
Customize the JSON file netplugin/systemtests/cfg.json according to your environment. A typical file for vagrant with swarm looks like:
15+
```
16+
[
17+
{
18+
"scheduler" : "swarm", //Scheduler used : Docker, Swarm, k8s
19+
"swarm_variable":"DOCKER_HOST=192.168.2.10:2375", //Env variable for swarm. Typically <master node's IP>:2375
20+
"platform" : "vagrant", //Platform: Vagrant or Platform
21+
"product" : "netplugin", // Product: netplugin or volplugin(in future this will be supported)
22+
"aci_mode" : "off", // ACI mode: on/off
23+
"short" : false, // Do a quick validation run instead of the full test suite
24+
"containers" : 3, // Number of containers to use
25+
"iterations" : 2, // Number of iterations
26+
"enableDNS" : false, //Enable DNS service discovery
27+
"contiv_cluster_store" : "etcd://localhost:2379", //cluster store URL for etcd or consul
28+
"contiv_l3" : "", //For running in routing mode
29+
"key_file" : "", //Insecure private key for swarm setup on Baremetal
30+
"binpath" : "/opt/gopath/bin", //netplugin/netmaster binary path. /home/admin/bin for baremetal
31+
32+
"hostips" : "", // host IPs for swarm setup on Baremetal, separated by comma
33+
"hostusernames" : "", // host usernames for swarm setup on Baremetal, separated by comma
34+
"dataInterface" : "eth2",
35+
"mgmtInterface" : "eth1",
36+
37+
// variables for ACI tests:
38+
"vlan" : "1120-1150",
39+
"vxlan" : "1-10000",
40+
"subnet" : "10.1.1.0/24",
41+
"gateway" : "10.1.1.254",
42+
"network" : "default",
43+
"tenant": "TestTenant",
44+
"encap" : "vlan"
45+
}
46+
]
47+
```
48+
49+
Testing with Vagrant:
50+
51+
* Make a suitable JSON file on your local machine (inside the systemtests directory).
52+
* From the netplugin directory of your machine (outside the vagrant nodes), run:
53+
54+
```
55+
make system-test
56+
```
57+
Testing with Baremetal with Swarm:
58+
59+
For ACI testing , We need to have connectivity to APIC and ACI Fabric Switches from Baremetal VMs and Hosts.
60+
* You need to complete Pre-requisites, Step 1, Step 2, Step3 metioned here : https://github.com/contiv/demo/tree/master/net
61+
* Make a suitable JSON file on your local machine (inside the systemtests directory).
62+
* Set these Environment variables on the master node:
63+
64+
```
65+
export GOPATH=/home/admin
66+
export GOBIN=$GOPATH/bin
67+
export PATH=$PATH:$GOBIN:/usr/local/go/bin
68+
```
69+
70+
* Build the code on master node. You can run from $GOPATH/src/github.com/contiv/netplugin
71+
```
72+
make run-build
73+
```
74+
* Run Systemtests like this
75+
```
76+
godep go test -v -timeout 240m ./systemtests -check.v -check.f "<Test Function>"
77+
for eg :
78+
79+
godep go test -v -timeout 240m ./systemtests -check.v -check.f "TestPolicyFromEPGVLAN"
80+
81+
This will run TestPolicyFromEPGVLAN test function mentioned in systemtests/policy_test.go
82+
83+
godep go test -v -timeout 240m ./systemtests -check.v -check.f "TestACI"
84+
85+
This will run all the test functions which have the string TestACI
86+
```
87+
Troubleshooting
88+
89+
* First delete all netmaster, netctl, netplugin, contivk8s binaries from $GOBIN directory from all Nodes in the Cluster
90+
* You can perform following steps to clear etcd states
91+
```
92+
sudo etcdctl rm --recursive /contiv
93+
sudo etcdctl rm --recursive /contiv.io
94+
sudo etcdctl rm --recursive /docker
95+
sudo etcdctl rm --recursive /skydns
96+
```
97+
* You can restart the nodes (sudo /sbin/shutdown -r now)
98+
* Run net_demo_installer script with -suitable options again to launch Swarm cluster and all other services properly. This infra basically relies on this script to start all the services correctly and then it kills netplugin and netmaster services and start those from the source binaries which you build.

0 commit comments

Comments
 (0)