Merge "[SO] create generic pnf healthcheck workflow"

diff --combined mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
index 1910b54,b3151db..33d86a2
--- 1/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
--- 2/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/ServiceInstancesTest.java
@@@ -1,8 -1,6 +1,6 @@@
  /*-
   * ============LICENSE_START=======================================================
-  * ONAP - SO
-  * ================================================================================
-  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  *  Copyright (C) 2020 Nordix Foundation.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@@ -15,6 -13,8 +13,8 @@@
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
+  *
+  * SPDX-License-Identifier: Apache-2.0
   * ============LICENSE_END=========================================================
   */
  
@@@ -97,8 -97,6 +97,8 @@@ public class ServiceInstancesTest exten
  
      private final String servInstanceuri = "/onap/so/infra/serviceInstantiation/";
      private final String servInstanceUriPrev7 = "/onap/so/infra/serviceInstances/";
 +    private final String orchestration_path = "/onap/so/infra";
 +
      private String uri;
      private URL selfLink;
      private URL initialUrl;
@@@ -117,7 -115,7 +117,7 @@@
          headers.set(ONAP_PARTNER_NAME, "VID");
          headers.set(REQUESTOR_ID, "xxxxxx");
          try { // generate one-time port number to avoid RANDOM port number later.
 -            initialUrl = new URL(createURLWithPort(Constants.ORCHESTRATION_REQUESTS_PATH));
 +            initialUrl = new URL(createURLWithPort(Constants.ORCHESTRATION_REQUESTS_PATH, orchestration_path));
              initialPort = initialUrl.getPort();
          } catch (MalformedURLException e) {
              e.printStackTrace();