Code Review
/
aai
/
esr-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Clean the config files.
[aai/esr-server.git]
/
esr-mgr
/
src
/
main
/
java
/
org
/
onap
/
aai
/
esr
/
externalservice
/
aai
/
CloudRegionProxy.java
diff --git
a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/CloudRegionProxy.java
b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/CloudRegionProxy.java
index
53e5fef
..
aeda6cf
100644
(file)
--- a/
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/CloudRegionProxy.java
+++ b/
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/CloudRegionProxy.java
@@
-16,6
+16,7
@@
package org.onap.aai.esr.externalservice.aai;
import org.glassfish.jersey.client.ClientConfig;
package org.onap.aai.esr.externalservice.aai;
import org.glassfish.jersey.client.ClientConfig;
+import org.onap.aai.esr.common.MsbConfig;
import org.onap.aai.esr.entity.aai.CloudRegionDetail;
import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
import org.onap.aai.esr.entity.aai.CloudRegionDetail;
import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
@@
-29,15
+30,15
@@
public class CloudRegionProxy {
private static String authorization = AaiCommon.getAuthenticationCredentials();
static {
ClientConfig config = new ClientConfig();
private static String authorization = AaiCommon.getAuthenticationCredentials();
static {
ClientConfig config = new ClientConfig();
- adapterServiceproxy = ConsumerFactory.createConsumer(
AaiAdapter
Config.getCloudInfrastructureAddr(),
+ adapterServiceproxy = ConsumerFactory.createConsumer(
Msb
Config.getCloudInfrastructureAddr(),
config, ICloudRegion.class);
}
config, ICloudRegion.class);
}
- public static void registerVim(String cloudOwner, String cloudRegionId,
CloudRegionDetail cloudRegion)
- throws Exception {
- ClientConfig config = new ClientConfig(new
RegisterVim
Provider());
+ public static void registerVim(String cloudOwner, String cloudRegionId,
+
CloudRegionDetail cloudRegion)
throws Exception {
+ ClientConfig config = new ClientConfig(new
VimRegister
Provider());
ICloudRegion registerVimServiceproxy = ConsumerFactory
ICloudRegion registerVimServiceproxy = ConsumerFactory
- .createConsumer(
AaiAdapter
Config.getCloudInfrastructureAddr(), config, ICloudRegion.class);
+ .createConsumer(
Msb
Config.getCloudInfrastructureAddr(), config, ICloudRegion.class);
registerVimServiceproxy.registerVIMService(transactionId, fromAppId, authorization, cloudOwner,
cloudRegionId, cloudRegion);
}
registerVimServiceproxy.registerVIMService(transactionId, fromAppId, authorization, cloudOwner,
cloudRegionId, cloudRegion);
}
@@
-46,8
+47,14
@@
public class CloudRegionProxy {
return adapterServiceproxy.queryVIMDetail(transactionId, fromAppId, authorization, cloud_owner,
cloud_region_id);
}
return adapterServiceproxy.queryVIMDetail(transactionId, fromAppId, authorization, cloud_owner,
cloud_region_id);
}
-
+
public static String qureyVimList() throws Exception {
return adapterServiceproxy.queryVIMList(transactionId, fromAppId, authorization);
}
public static String qureyVimList() throws Exception {
return adapterServiceproxy.queryVIMList(transactionId, fromAppId, authorization);
}
+
+ public static void deleteVim(String cloud_owner, String cloud_region_id, String resourceVersion)
+ throws Exception {
+ adapterServiceproxy.deleteVim(transactionId, fromAppId, authorization, cloud_owner,
+ cloud_region_id, resourceVersion);
+ }
}
}