X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fso%2Fintegration-etsi-testing%2Fso-simulators%2Faai-simulator%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fso%2Faaisimulator%2Futils%2FConstants.java;h=4cd5b25afc2de8a57c9ca4b72c3432f6153cadff;hb=aa686f94515f61d89652a587b92447c8f3dbe2d2;hp=de3f998344ecded56342cb6eea083209102ef7d1;hpb=ccb602658c56b9ab10d8f49feba53612e06c9b93;p=integration%2Fcsit.git

diff --git a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java
index de3f9983..4cd5b25a 100644
--- a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java
+++ b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java
@@ -25,7 +25,7 @@ package org.onap.so.aaisimulator.utils;
  */
 public class Constants {
 
-    public static final String BASE_URL = "/aai/v15";
+    public static final String BASE_URL = "/aai/v{version:\\d+}";
 
     public static final String NODES_URL = BASE_URL + "/nodes";
 
@@ -43,11 +43,11 @@ public class Constants {
 
     public static final String PLATFORMS_URL = BUSINESS_URL + "/platforms/platform/";
 
-    public static final String EXTERNAL_SYSTEM_ESR_VNFM_LIST_URL = "/external-system/esr-vnfm-list/";
+    public static final String EXTERNAL_SYSTEM_ESR_VNFM_LIST_URL = BASE_URL + "/external-system/esr-vnfm-list";
 
     public static final String NETWORK_URL = BASE_URL + "/network";
 
-    public static final String GENERIC_VNFS_URL = NETWORK_URL + "/generic-vnfs/";
+    public static final String GENERIC_VNFS_URL = NETWORK_URL + "/generic-vnfs";
 
     public static final String RELATIONSHIP_LIST_RELATIONSHIP_URL = "/relationship-list/relationship";
 
@@ -68,6 +68,8 @@ public class Constants {
 
     public static final String X_HTTP_METHOD_OVERRIDE = "X-HTTP-Method-Override";
 
+    public static final String APPLICATION_MERGE_PATCH_JSON = "application/merge-patch+json";
+
     public static final String SERVICE_RESOURCE_TYPE = "service-instance";
 
     public static final String RESOURCE_LINK = "resource-link";
@@ -87,6 +89,8 @@ public class Constants {
     public static final String COMPOSED_OF = "org.onap.relationships.inventory.ComposedOf";
 
     public static final String GENERIC_VNF = "generic-vnf";
+    
+    public static final String VF_MODULE = "vf-module";
 
     public static final String PLATFORM = "platform";
 
@@ -128,6 +132,18 @@ public class Constants {
 
     public static final String ESR_SYSTEM_INFO_LIST = "esr-system-info-list";
 
+    public static final String ESR_VNFM_VNFM_ID = "esr-vnfm.vnfm-id";
+
+    public static final String DEPENDS_ON = "tosca.relationships.DependsOn";
+
+    public static final String VSERVER_VSERVER_NAME = "vserver.vserver-name";
+
+    public static final String VSERVER_VSERVER_ID = "vserver.vserver-id";
+
+    public static final String HOSTED_ON = "tosca.relationships.HostedOn";
+
+    public static final String VSERVER = "vserver";
+
     private Constants() {}
 
 }