X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fexternalservice%2Faai%2FIEsrVimRest.java;h=b257d79f32008ee24da9d44fbb9e7b136a72c276;hb=0f4c91c98e9fe5e403c110a85375778b7fad04fb;hp=0c45938297801f03c107466d2303c66c316e2836;hpb=fa6dd60a45a093205ae55065f6de044c91493e60;p=aai%2Fesr-server.git

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IEsrVimRest.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IEsrVimRest.java
index 0c45938..b257d79 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IEsrVimRest.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IEsrVimRest.java
@@ -25,7 +25,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
 import org.glassfish.jersey.client.ClientResponse;
-import org.onap.aai.esr.externalservice.entity.CloudRegion;
+import org.onap.aai.esr.entity.aai.CloudRegion;
 
 import retrofit2.http.Header;
 import retrofit2.http.Headers;
@@ -34,48 +34,48 @@ import retrofit2.http.Headers;
 @Path("/aai/v11/cloud-infrastructure/cloud-regions")
 public interface IEsrVimRest {
 
-//  @Headers({  
-//    "X-TransactionId: 9999",
-//    "Accept: application/json",  
-//    "X-FromAppId: aai-esr"
-//  })
-//  @Path("/cloud-region/{cloud_owner}/{cloud_region_id}")
-//  @PUT
-//  @Consumes(MediaType.APPLICATION_JSON)
-//
-//  public ClientResponse registerVIMServce(@Header("Authorization") String authorization, @PathParam("cloud_owner") String cloud_owner,
-//      CloudRegion entity) throws Exception;
-//
-//  @Headers({  
-//    "X-TransactionId: 9999",
-//    "Accept: application/json",  
-//    "X-FromAppId: aai-esr"
-//  })
-//  @Path("/cloud-region/{cloud_owner}/{cloud_region_id}?depth=all")
-//  @GET
-//  @Produces(MediaType.APPLICATION_JSON)
-//  public ClientResponse queryVIMDetail(@Header("Authorization") String authorization, @PathParam("cloud_owner") String cloud_owner,
-//      @PathParam("cloud_region_id") String cloud_region_id) throws Exception;
-//  
-//  @Headers({  
-//    "X-TransactionId: 9999",
-//    "Accept: application/json",  
-//    "X-FromAppId: aai-esr"
-//  })
-//  @Path("/")
-//  @GET
-//  @Produces(MediaType.APPLICATION_JSON)
-//  public ClientResponse queryVIMList(@Header("Authorization") String authorization) throws Exception;
-//  
-//
-//  @Headers({  
-//    "X-TransactionId: 9999",
-//    "Accept: application/json",  
-//    "X-FromAppId: aai-esr"
-//  })
-//  @Path("/cloud-region/{cloud_owner}/{cloud_region_id}/esr-system-info/{esr_system_info_id}")
-//  @GET
-//  public ClientResponse delVIMAuthInfo(@Header("Authorization") String authorization, @PathParam("cloud_owner") String cloud_owner,
-//      @PathParam("cloud_region_id") String cloud_region_id, @PathParam("esr_system_info_id") String esr_system_info_id) throws Exception;
+  @Headers({  
+    "X-TransactionId: 9999",
+    "Accept: application/json",  
+    "X-FromAppId: aai-esr"
+  })
+  @Path("/cloud-region/{cloud_owner}/{cloud_region_id}")
+  @PUT
+  @Consumes(MediaType.APPLICATION_JSON)
+
+  public ClientResponse registerVIMServce(@Header("Authorization") String authorization, @PathParam("cloud_owner") String cloud_owner,
+      CloudRegion entity);
+
+  @Headers({  
+    "X-TransactionId: 9999",
+    "Accept: application/json",  
+    "X-FromAppId: aai-esr"
+  })
+  @Path("/cloud-region/{cloud_owner}/{cloud_region_id}?depth=all")
+  @GET
+  @Produces(MediaType.APPLICATION_JSON)
+  public ClientResponse queryVIMDetail(@Header("Authorization") String authorization, @PathParam("cloud_owner") String cloud_owner,
+      @PathParam("cloud_region_id") String cloud_region_id);
+  
+  @Headers({  
+    "X-TransactionId: 9999",
+    "Accept: application/json",  
+    "X-FromAppId: aai-esr"
+  })
+  @Path("/")
+  @GET
+  @Produces(MediaType.APPLICATION_JSON)
+  public ClientResponse queryVIMList(@Header("Authorization") String authorization);
+  
+
+  @Headers({  
+    "X-TransactionId: 9999",
+    "Accept: application/json",  
+    "X-FromAppId: aai-esr"
+  })
+  @Path("/cloud-region/{cloud_owner}/{cloud_region_id}/esr-system-info/{esr_system_info_id}")
+  @GET
+  public ClientResponse delVIMAuthInfo(@Header("Authorization") String authorization, @PathParam("cloud_owner") String cloud_owner,
+      @PathParam("cloud_region_id") String cloud_region_id, @PathParam("esr_system_info_id") String esr_system_info_id);
   
 }