Skip to content

Commit

Permalink
Merge pull request #451 from apoorva11029/Issue#450
Browse files Browse the repository at this point in the history
Resolving Issue#450
  • Loading branch information
shaleman committed Jul 12, 2016
2 parents aee2094 + bead086 commit ec2b3e8
Show file tree
Hide file tree
Showing 12 changed files with 4 additions and 1,463 deletions.
6 changes: 3 additions & 3 deletions scripts/python/api/tbed.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,17 +207,17 @@ def checkConnectionPair(self, fromContainers, toContainers, port, success):
return success

# Look for any error logs on all nodes
def chekForNetpluginErrors(self):
def checkForNetpluginErrors(self):
for node in self.nodes:
ret = node.chekForNetpluginErrors()
ret = node.checkForNetpluginErrors()
if ret == False and self.failOnError:
tutils.exit("Errors in log file")

# Print netplugin errors if any and exit
def errExit(self, str):
# print erros from netplugin log file
for node in self.nodes:
node.chekForNetpluginErrors()
node.checkForNetpluginErrors()

# exit the script
tutils.exit(str)
2 changes: 1 addition & 1 deletion scripts/python/api/tnode.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def runContainer(self, imgName="ubuntu:14.04", cmdName="sh", networkName=None, s
# Return a container object
return container.Container(self, cid, cntName="")

def chekForNetpluginErrors(self):
def checkForNetpluginErrors(self):
out, err, exitCode = self.runCmd('grep "error\|fatal" /tmp/net*')
if out != [] or err != []:
print "\n\n\n\n\n\n"
Expand Down
100 changes: 0 additions & 100 deletions scripts/python/runTestCase.py

This file was deleted.

121 changes: 0 additions & 121 deletions scripts/python/sanity.py

This file was deleted.

90 changes: 0 additions & 90 deletions scripts/python/setupProxy.py

This file was deleted.

Empty file.
48 changes: 0 additions & 48 deletions scripts/python/testcases/tcAci.py

This file was deleted.

Loading

0 comments on commit ec2b3e8

Please sign in to comment.