diff options
| author |   Kanagaraj Manickam <kanagaraj.manickam@huawei.com> | 2018-03-26 06:49:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-26 06:49:35 +0000 |
| commit | c8114fe928e3a6c48ea02fa8e2a168f7102f770b (patch) | |
| tree | 44bdeb88ee7642eda8077afefcfd4bbbb98d3f22 /profiles/http/src/main/java | |
| parent | 5c094b10096c629804b9e266d05b74e90512ad8b (diff) | |
| parent | 8c08476d0b6bffa3230a0e34ff29586eefed38e0 (diff) | |
Merge "Enable feature to disable mock for verify"
Diffstat (limited to 'profiles/http/src/main/java')
| -rw-r--r-- | profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java | 16 | ||||
| -rw-r--r-- | profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java | 1 |
2 files changed, 13 insertions, 4 deletions
diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java b/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java index 9477cfa9..6574552e 100644 --- a/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java +++ b/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java @@ -68,6 +68,8 @@ public class OnapHttpCommand extends OnapCommand { boolean shouldVerify = false; + boolean mockingEnabled; + public OnapHttpCommand() { super.addDefaultSchemas(OnapCommandHttpConstants.DEFAULT_PARAMETER_HTTP_FILE_NAME); } @@ -176,17 +178,23 @@ public class OnapHttpCommand extends OnapCommand { if (contextOpt.isPresent()) { OnapCommandParameter context = contextOpt.get(); - String mockedFile = ((Map<String, String>)context.getValue()).get(OnapCommandConstants.VERIFY_MOCO); + Map<String, String> map = (Map<String, String>) context.getValue(); + + mockingEnabled = map.containsKey(OnapCommandHttpConstants.VERIFY_DISABLE_MOCKING) + && map.get(OnapCommandHttpConstants.VERIFY_DISABLE_MOCKING).equals("true") ? false : true; - mocoServer = new MocoServer(mockedFile); - mocoServer.start(); + if (mockingEnabled) { + String mockedFile = ((Map<String, String>) context.getValue()).get(OnapCommandConstants.VERIFY_MOCO); + mocoServer = new MocoServer(mockedFile); + mocoServer.start(); + } } } } @Override protected void postRun() throws OnapCommandException { - if (shouldVerify) { + if (shouldVerify && mockingEnabled) { mocoServer.stop(); } } diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java b/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java index 185582cb..18dde339 100644 --- a/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java +++ b/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java @@ -108,6 +108,7 @@ public class OnapCommandHttpConstants { public static final String VERIFY_RESPONSE = "response"; public static final String VERIFY_CONTENT_TYPE = "Content-Type"; public static final String VERIFY_CONTENT_TYPE_VALUE = APPLICATION_JSON; + public static final String VERIFY_DISABLE_MOCKING = "DISABLE_MOCKING"; } |