[trafficserver] branch master updated: added flag for port number in microdns, microserver extension.

[paziz]

This is an automated email from the ASF dual-hosted git repository.

paziz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 8b40e36  added flag for port number in microdns, microserver extension.
8b40e36 is described below

commit 8b40e3684287df07744ccd55fe8ce62531b9a9f3
Author: umohan <umo...@yahoo-inc.com>
AuthorDate: Tue Oct 10 02:47:05 2017 +0000

    added flag for port number in microdns, microserver extension.
---
 tests/gold_tests/autest-site/microDNS.test.ext    |  7 +++++--
 tests/gold_tests/autest-site/microserver.test.ext | 15 +++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tests/gold_tests/autest-site/microDNS.test.ext 
b/tests/gold_tests/autest-site/microDNS.test.ext
index f02f643..58dbfc7 100644
--- a/tests/gold_tests/autest-site/microDNS.test.ext
+++ b/tests/gold_tests/autest-site/microDNS.test.ext
@@ -53,13 +53,15 @@ def addRecordtoDNS(self,filename,hostname,list_ip_addr=[]):
 
 
 
-def MakeDNServer(obj, name,filename,IP='127.0.0.1',rr=False,options={}):
+
+def MakeDNServer(obj, 
name,filename,IP='127.0.0.1',port=False,rr=False,options={}):
     server_path= os.path.join(obj.Variables.AtsTestToolsDir,'microDNS/uDNS.py')
     data_dir = os.path.join(obj.RunDirectory, name)
     filepath = os.path.join(data_dir,filename)
     # create Process
     p = obj.Processes.Process(name)
-    port=get_port(p,"Port")
+    if (port == False):
+        port=get_port(p,"Port")
     command = "python3 {3} {0} {1} {2}".format(IP, port,filepath,server_path)
 
 
@@ -67,6 +69,7 @@ def MakeDNServer(obj, 
name,filename,IP='127.0.0.1',rr=False,options={}):
     p.Command = command
     p.Setup.MakeDir(data_dir)
     p.Variables.DataDir = data_dir
+    p.ReturnCode = None
     p.Ready = When.PortOpen(port)
     AddMethodToInstance(p,AddRecord)
     AddMethodToInstance(p,addRecordtoDNS)
diff --git a/tests/gold_tests/autest-site/microserver.test.ext 
b/tests/gold_tests/autest-site/microserver.test.ext
index af211e2..e06fa9a 100644
--- a/tests/gold_tests/autest-site/microserver.test.ext
+++ b/tests/gold_tests/autest-site/microserver.test.ext
@@ -97,13 +97,19 @@ def makeHeader(self,requestString, **kwargs):
     return headerStr
 
 
-def MakeOriginServer(obj, name,public_ip=False,ssl=False,options={}):
+def MakeOriginServer(obj, name,port=False, ip=False, delay=False, 
public_ip=False,ssl=False,options={}):
     server_path= 
os.path.join(obj.Variables.AtsTestToolsDir,'microServer/uWServer.py')
     data_dir = os.path.join(obj.RunDirectory, name)
     # create Process
     p = obj.Processes.Process(name)
-    port=get_port(p,"Port")
-    command = "python3 {0} --data-dir {1} --port {2} --public {3} -m test 
--ssl {4}".format(server_path, data_dir, port, public_ip,ssl)
+    if (port == False):
+        port=get_port(p,"Port")
+        print("port num",port)
+    if (ip == False):
+        ip = '127.0.0.1'
+    if (delay == False):
+        delay = 0
+    command = "python3 {0} --data-dir {1} --port {2} --ip_address {3} --delay 
{4} --public {5} -m test --ssl {6}".format(server_path, data_dir, port, ip, 
delay, public_ip,ssl)
     for flag,value in options.items() :
         command += " {} {}".format(flag,value)
 
@@ -111,7 +117,8 @@ def MakeOriginServer(obj, 
name,public_ip=False,ssl=False,options={}):
     p.Command = command
     p.Setup.MakeDir(data_dir)
     p.Variables.DataDir = data_dir
-    p.Ready = When.PortOpen(port)
+    p.Ready = When.PortOpen(port,ip)
+    p.ReturnCode = None
     AddMethodToInstance(p,addResponse)
     AddMethodToInstance(p,addTransactionToSession)
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].