Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add extra validation check for v2plugin #1096

Merged
merged 3 commits into from
Dec 6, 2017
Merged

Add extra validation check for v2plugin #1096

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b61ac1
Add extra validation check for v2plugin
kahou82 Dec 5, 2017
e14aa79
Update don't care variable
kahou82 Dec 5, 2017
18de264
remove garbage text
kahou82 Dec 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions scripts/python/startSwarm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

# Start netplugin and netmaster
import api.tnode
import time
import sys
import os
import argparse
import os
import re
import time

# Parse command line args
# Create the parser and sub parser
Expand Down Expand Up @@ -45,6 +45,21 @@
node.runCmdThread(command)

time.sleep(15)

print "Check netplugin is installed and enabled"
out, x, y = nodes[0].runCmd("docker plugin ls")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you don't care about the err and exit value, use '_', though I think you could have docker installed but docker plugin ls fail when dockerd is not running, so you might want to check exit status

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 done.


installed = re.search('contiv/v2plugin', out[1])

if installed == None:
print "Make target failed: Contiv plugin is not installed"
os._exit(1)

enabled = re.search('false', out[1])
if enabled != None:
print "Make target failed: Contiv plugin is installed but disabled"
os._exit(1)

print "################### Swarm Mode is up #####################"
else:
swarmScript= scriptPath + "/start-swarm.sh"
Expand Down