From 979f0fa70cbe576f8eed5e56db467b261a1919cf Mon Sep 17 00:00:00 2001
From: lizi00164331
Date: Thu, 21 Sep 2017 16:01:16 +0800
Subject: [PATCH 1/1] Fix the return data of delete and query API.
Change-Id: Id9d4b3cc50b51b96cbbf6036aa306e5be1d4558f
Issue-ID: AAI-359
Signed-off-by: lizi00164331
---
.../src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java | 4 ++--
.../main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java | 6 +++---
.../src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java | 2 +-
.../src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
index e6e0f69..07e510e 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
@@ -90,7 +90,7 @@ public class EmsManagerWrapper {
} catch (Exception e) {
e.printStackTrace();
LOG.error("Query EMS list failed !");
- return Response.serverError().build();
+ return Response.ok().build();
}
}
@@ -120,7 +120,7 @@ public class EmsManagerWrapper {
}
} else {
LOG.error("resouce-version is null ! Can not delete resouce from A&AI. ");
- return Response.serverError().build();
+ return Response.noContent().build();
}
}
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java
index 0dfd45a..9e6f3f8 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java
@@ -105,7 +105,7 @@ public class ThirdpatySdncWrapper {
} catch (Exception e) {
e.printStackTrace();
LOG.error("Query thirdparty SDNC list failed !");
- return Response.serverError().build();
+ return Response.ok().build();
}
}
@@ -126,7 +126,7 @@ public class ThirdpatySdncWrapper {
if (resourceVersion != null) {
try {
ExternalSystemProxy.deleteThirdpartySdnc(thirdpartySdncId, resourceVersion);
- return Response.ok().build();
+ return Response.noContent().build();
} catch (Exception e) {
e.printStackTrace();
LOG.error("Delete VNFM from A&AI failed! thirdparty SDNC ID: " + thirdpartySdncId + "resouce-version:"
@@ -135,7 +135,7 @@ public class ThirdpatySdncWrapper {
}
} else {
LOG.error("resouce-version is null ! Can not delete resouce from A&AI. ");
- return Response.serverError().build();
+ return Response.noContent().build();
}
}
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
index 6d06a1c..bdf4705 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
@@ -101,7 +101,7 @@ public class VimManagerWrapper {
} catch (Exception error) {
error.printStackTrace();
LOG.error("Query vim list details failed !" + error.getMessage());
- return Response.serverError().build();
+ return Response.ok().build();
}
}
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java
index a0ca60d..9187897 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java
@@ -103,7 +103,7 @@ public class VnfmManagerWrapper {
} catch (Exception e) {
e.printStackTrace();
LOG.error("Query VNFM list failed !");
- return Response.serverError().build();
+ return Response.ok().build();
}
}
@@ -127,11 +127,11 @@ public class VnfmManagerWrapper {
e.printStackTrace();
LOG.error("Delete VNFM from A&AI failed! VNFM ID: " + vnfmId + "resouce-version:"
+ resourceVersion, e.getMessage());
- return Response.serverError().build();
+ return Response.noContent().build();
}
} else {
LOG.error("resouce-version is null ! Can not delete resouce from A&AI. ");
- return Response.serverError().build();
+ return Response.noContent().build();
}
}
--
2.16.6