diff options
6 files changed, 8 insertions, 8 deletions
@@ -14,9 +14,7 @@ License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/test/functest/scripts/start-simulators.sh b/test/functest/scripts/start-simulators.sh index 11767e0..a3f3db1 100755 --- a/test/functest/scripts/start-simulators.sh +++ b/test/functest/scripts/start-simulators.sh @@ -40,9 +40,10 @@ SIMULATORS_DIR=$FUNC_TEST_DIR/simulators ln -s $SIMULATORS_DIR/simulated-config config XPID=$(ps -x | grep "python oof_dependencies_simulators.py" | grep -v grep | awk '{print $1}') + echo "simulator pid " $XPID if [ -z "$XPID" ]; then python oof_dependencies_simulators.py > simulator-logs 2>&1 & - sleep 5 + sleep 10 fi ) diff --git a/test/functest/simulators/has-api/response-payloads/flow1-success-simple/main.json b/test/functest/simulators/has-api/response-payloads/flow1-success-simple/main.json index a56840a..0d375c1 100644 --- a/test/functest/simulators/has-api/response-payloads/flow1-success-simple/main.json +++ b/test/functest/simulators/has-api/response-payloads/flow1-success-simple/main.json @@ -4,7 +4,7 @@ "links": [ [ { - "href": "http://localhost:5000/simulated/oof/has-api/flow1-success-simple/status-solving.json", + "href": "http://127.0.0.1:5000/simulated/oof/has-api/flow1-success-simple/status-solving.json", "rel": "self" } ] diff --git a/test/functest/simulators/has-api/response-payloads/flow1-success-simple/status-solving.json b/test/functest/simulators/has-api/response-payloads/flow1-success-simple/status-solving.json index 8bb074f..2bdbfe8 100644 --- a/test/functest/simulators/has-api/response-payloads/flow1-success-simple/status-solving.json +++ b/test/functest/simulators/has-api/response-payloads/flow1-success-simple/status-solving.json @@ -6,7 +6,7 @@ "links": [ [ { - "href": "http://localhost:5000/simulated/oof/has-api/flow1-success-simple/status-done.json", + "href": "http://127.0.0.1:5000/simulated/oof/has-api/flow1-success-simple/status-done.json", "rel": "self" } ] diff --git a/test/functest/simulators/simulated-config/osdf_config.yaml b/test/functest/simulators/simulated-config/osdf_config.yaml index a192b70..0a77fe2 100755 --- a/test/functest/simulators/simulated-config/osdf_config.yaml +++ b/test/functest/simulators/simulated-config/osdf_config.yaml @@ -5,14 +5,14 @@ odfPasswordForSO: "" # The OSDF Manager password for MSO. soUsername: "" # SO username for call back. soPassword: "" # SO password for call back. -conductorUrl: "http://localhost:5000/simulated/oof/has-api/flow1-success-simple/main.json" +conductorUrl: "http://127.0.0.1:5000/simulated/oof/has-api/flow1-success-simple/main.json" conductorUsername: "CONDUCTOR-USER" conductorPassword: "CONDUCTOR-PASSWD" conductorPingWaitTime: 2 # seconds to wait before calling the conductor retry URL conductorMaxRetries: 5 # if we don't get something in 30 minutes, give up # Policy Platform -- requires ClientAuth, Authorization, and Environment -policyPlatformUrl: http://localhost:5001/simulated/policy/pdp-has-vcpe-good/pdp/getConfig # Policy Dev platform URL +policyPlatformUrl: http://127.0.0.1:5001/simulated/policy/pdp-has-vcpe-good/pdp/getConfig # Policy Dev platform URL policyPlatformEnv: TEST # Environment for policy platform policyPlatformUsername: POLICY-USER # Policy platform username. policyPlatformPassword: POLICY-PASSWD # Policy platform password. @@ -6,6 +6,7 @@ envlist = py3 [testenv] distribute = False commands = + - cat /etc/hosts /bin/bash test/functest/scripts/start-simulators.sh coverage run --module pytest --junitxml xunit-results.xml coverage xml --omit=".tox/py3/*","test/*" |