Merge "Preloading native policy type for apex-pdp"

diff --combined main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
index 434185a,98916db..8ede881
--- 1/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
--- 2/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
+++ b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
@@@ -85,7 -85,7 +85,7 @@@ public class TestApiRestServer 
      private static final Logger LOGGER = LoggerFactory.getLogger(TestApiRestServer.class);
      private static final String NOT_ALIVE = "not alive";
      private static final String ALIVE = "alive";
 -    private static final String SELF = "self";
 +    private static final String SELF = NetworkUtil.getHostname();
      private static final String NAME = "Policy API";
      private static final String APP_JSON = "application/json";
      private static final String APP_YAML = "application/yaml";
@@@ -704,7 -704,7 +704,7 @@@
          Response rawResponse = readResource(POLICYTYPES, true, APP_JSON);
          assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
          ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
-         assertEquals(25, response.getPolicyTypes().size());
+         assertEquals(26, response.getPolicyTypes().size());
      }
  
      @Test
@@@ -714,7 -714,7 +714,7 @@@
          Response rawResponse = readResource(POLICYTYPES, true, APP_YAML);
          assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
          ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
-         assertEquals(25, response.getPolicyTypes().size());
+         assertEquals(26, response.getPolicyTypes().size());
      }
  
      @Test