Add entity definition for external system.

Add entity definition for external system. These entities will be used to interact with A&AI API.

Change-Id: Ia372d23171f77332aca5ce52139e312f7c5585e8
Issue-ID: AAI-283
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/AuthInfo.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/AuthInfo.java
new file mode 100644 (file)
index 0000000..f7663b8
--- /dev/null
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/AuthInfo.java
@@ -0,0 +1,190 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onap.aai.esr.entity.aai;
+
+public class AuthInfo {
+  
+  private String esrSystemInfoId;
+  
+  private String systemName;
+  
+  private String type;
+  
+  private String vendor;
+  
+  private String version;
+  
+  private String serviceUrl;
+  
+  private String userName;
+  
+  private String password;
+  
+  private String systemType;
+  
+  private String protocal;
+  
+  private String sslCassert;
+  
+  private String sslInsecure;
+  
+  private String ipAddress;
+  
+  private String port;
+  
+  private String cloudDomain;
+  
+  private String defaultTenant;
+  
+  private String systemStatus;
+
+  public String getEsrSystemInfoId() {
+    return esrSystemInfoId;
+  }
+
+  public void setEsrSystemInfoId(String esrSystemInfoId) {
+    this.esrSystemInfoId = esrSystemInfoId;
+  }
+
+  public String getSystemName() {
+    return systemName;
+  }
+
+  public void setSystemName(String systemName) {
+    this.systemName = systemName;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  public String getVendor() {
+    return vendor;
+  }
+
+  public void setVendor(String vendor) {
+    this.vendor = vendor;
+  }
+
+  public String getVersion() {
+    return version;
+  }
+
+  public void setVersion(String version) {
+    this.version = version;
+  }
+
+  public String getServiceUrl() {
+    return serviceUrl;
+  }
+
+  public void setServiceUrl(String serviceUrl) {
+    this.serviceUrl = serviceUrl;
+  }
+
+  public String getUserName() {
+    return userName;
+  }
+
+  public void setUserName(String userName) {
+    this.userName = userName;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  public String getSystemType() {
+    return systemType;
+  }
+
+  public void setSystemType(String systemType) {
+    this.systemType = systemType;
+  }
+
+  public String getProtocal() {
+    return protocal;
+  }
+
+  public void setProtocal(String protocal) {
+    this.protocal = protocal;
+  }
+
+  public String getSslCassert() {
+    return sslCassert;
+  }
+
+  public void setSslCassert(String sslCassert) {
+    this.sslCassert = sslCassert;
+  }
+
+  public String getSslInsecure() {
+    return sslInsecure;
+  }
+
+  public void setSslInsecure(String sslInsecure) {
+    this.sslInsecure = sslInsecure;
+  }
+
+  public String getIpAddress() {
+    return ipAddress;
+  }
+
+  public void setIpAddress(String ipAddress) {
+    this.ipAddress = ipAddress;
+  }
+
+  public String getPort() {
+    return port;
+  }
+
+  public void setPort(String port) {
+    this.port = port;
+  }
+
+  public String getCloudDomain() {
+    return cloudDomain;
+  }
+
+  public void setCloudDomain(String cloudDomain) {
+    this.cloudDomain = cloudDomain;
+  }
+
+  public String getDefaultTenant() {
+    return defaultTenant;
+  }
+
+  public void setDefaultTenant(String defaultTenant) {
+    this.defaultTenant = defaultTenant;
+  }
+
+  public String getSystemStatus() {
+    return systemStatus;
+  }
+
+  public void setSystemStatus(String systemStatus) {
+    this.systemStatus = systemStatus;
+  }
+
+}

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/BaseData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/BaseData.java
deleted file mode 100644 (file)
index 3f3f491..0000000
--- a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/BaseData.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * Copyright 2016-2017 ZTE Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onap.aai.esr.entity.aai;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "extsys_base_table")
-@Inheritance(strategy = InheritanceType.JOINED)
-public class BaseData {
-  @Id
-  @Column(name = "ID")
-  private String id;
-
-  @Column(name = "NAME")
-  private String name;
-
-  @Column(name = "VENDOR")
-  private String vendor;
-
-  @Column(name = "VERSION")
-  private String version;
-
-  @Column(name = "DESCRIPTION")
-  private String description;
-
-  @Column(name = "TYPE")
-  private String type;
-  @Column(name = "CREATETIME")
-  private String createTime;
-  @Column(name = "CATAGORY")
-  private String category;
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getVendor() {
-    return vendor;
-  }
-
-  public void setVendor(String vendor) {
-    this.vendor = vendor;
-  }
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public String getCreateTime() {
-    return createTime;
-  }
-
-  public void setCreateTime(String createTime) {
-    this.createTime = createTime;
-  }
-
-  public String getCategory() {
-    return category;
-  }
-
-  public void setCategory(String category) {
-    this.category = category;
-  }
-
-}

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/CloudRegion.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/CloudRegion.java
new file mode 100644 (file)
index 0000000..64e5f4d
--- /dev/null
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/CloudRegion.java
@@ -0,0 +1,109 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onap.aai.esr.entity.aai;
+
+public class CloudRegion {
+
+  private String cloudOwner;
+  
+  private String cloudRegionId;
+  
+  private String cloudType;
+  
+  private String cloudRegionVersion;
+  
+  private String ownerDefinedType;
+  
+  private String cloudZone;
+  
+  private String complexName;
+  
+  private String cloudExtraInfo;
+  
+  private EsrSystemInfoList esrSystemInfoList;
+
+  public String getCloudOwner() {
+    return cloudOwner;
+  }
+
+  public void setCloudOwner(String cloudOwner) {
+    this.cloudOwner = cloudOwner;
+  }
+
+  public String getCloudRegionId() {
+    return cloudRegionId;
+  }
+
+  public void setCloudRegionId(String cloudRegionId) {
+    this.cloudRegionId = cloudRegionId;
+  }
+
+  public String getCloudType() {
+    return cloudType;
+  }
+
+  public void setCloudType(String cloudType) {
+    this.cloudType = cloudType;
+  }
+
+  public String getCloudRegionVersion() {
+    return cloudRegionVersion;
+  }
+
+  public void setCloudRegionVersion(String cloudRegionVersion) {
+    this.cloudRegionVersion = cloudRegionVersion;
+  }
+
+  public String getOwnerDefinedType() {
+    return ownerDefinedType;
+  }
+
+  public void setOwnerDefinedType(String ownerDefinedType) {
+    this.ownerDefinedType = ownerDefinedType;
+  }
+
+  public String getCloudZone() {
+    return cloudZone;
+  }
+
+  public void setCloudZone(String cloudZone) {
+    this.cloudZone = cloudZone;
+  }
+
+  public String getComplexName() {
+    return complexName;
+  }
+
+  public void setComplexName(String complexName) {
+    this.complexName = complexName;
+  }
+
+  public String getCloudExtraInfo() {
+    return cloudExtraInfo;
+  }
+
+  public void setCloudExtraInfo(String cloudExtraInfo) {
+    this.cloudExtraInfo = cloudExtraInfo;
+  }
+
+  public EsrSystemInfoList getEsrSystemInfoList() {
+    return esrSystemInfoList;
+  }
+
+  public void setEsrSystemInfoList(EsrSystemInfoList esrSystemInfoList) {
+    this.esrSystemInfoList = esrSystemInfoList;
+  }
+}

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EmsData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EmsData.java
deleted file mode 100644 (file)
index dc7fbed..0000000
--- a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EmsData.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright 2016-2017 ZTE Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onap.aai.esr.entity.aai;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-
-
-
-@Entity
-@Table(name = "extsys_ems_table")
-@PrimaryKeyJoinColumn(name = "EMSID")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class EmsData extends BaseData {
-
-
-  @Column(name = "PRODUCTNAME")
-  private String productName;
-
-  @Column(name = "URL")
-  private String url;
-
-  @Column(name = "USERNAME")
-  private String userName;
-
-  @Column(name = "PASSWORD")
-  private String password;
-
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public String getUserName() {
-    return userName;
-  }
-
-  public void setUserName(String userName) {
-    this.userName = userName;
-  }
-
-  public String getPassword() {
-    return password;
-  }
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-  public String getProductName() {
-    return productName;
-  }
-
-  public void setProductName(String productName) {
-    this.productName = productName;
-  }
-
-
-
-}

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrEms.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrEms.java
new file mode 100644 (file)
index 0000000..af37abd
--- /dev/null
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrEms.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright 2016-2017 ZTE Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onap.aai.esr.entity.aai;
+
+
+public class EsrEms {
+
+  private String emsId;
+  
+  private Boolean passive;
+  
+  private String remotePath;
+  
+  private EsrSystemInfoList esrSystemInfoList;
+
+  public String getEmsId() {
+    return emsId;
+  }
+
+  public void setEmsId(String emsId) {
+    this.emsId = emsId;
+  }
+
+  public Boolean getPassive() {
+    return passive;
+  }
+
+  public void setPassive(Boolean passive) {
+    this.passive = passive;
+  }
+
+  public String getRemotePath() {
+    return remotePath;
+  }
+
+  public void setRemotePath(String remotePath) {
+    this.remotePath = remotePath;
+  }
+
+  public EsrSystemInfoList getEsrSystemInfoList() {
+    return esrSystemInfoList;
+  }
+
+  public void setEsrSystemInfoList(EsrSystemInfoList esrSystemInfoList) {
+    this.esrSystemInfoList = esrSystemInfoList;
+  }
+}

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrSystemInfo.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrSystemInfo.java
new file mode 100644 (file)
index 0000000..b6be9a7
--- /dev/null
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrSystemInfo.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onap.aai.esr.entity.aai;
+
+import java.util.ArrayList;
+
+public class EsrSystemInfo {
+
+  private ArrayList<AuthInfo> esrSystemInfo;
+
+  public ArrayList<AuthInfo> getEsrSystemInfo() {
+    return esrSystemInfo;
+  }
+
+  public void setEsrSystemInfo(ArrayList<AuthInfo> esrSystemInfo) {
+    this.esrSystemInfo = esrSystemInfo;
+  }
+}

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/common/MsbUtil.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrSystemInfoList.java
similarity index 65%
rename from esr-mgr/src/main/java/org/onap/aai/esr/common/MsbUtil.java
rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrSystemInfoList.java
index 0bd4f01..535e5db 100644 (file)
--- a/esr-mgr/src/main/java/org/onap/aai/esr/common/MsbUtil.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrSystemInfoList.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */

-package org.onap.aai.esr.common;
+package org.onap.aai.esr.entity.aai;

 
 

+public class EsrSystemInfoList {

 
 

-public class MsbUtil {
+  private EsrSystemInfo esrSystemInfoList;

 
 

-//  public static String getVimBaseUrl() {
-//    return Config.getConfigration().getMsbServerAddr() + "/api/vim/v1";
-//  }
-//
-//  public static String getAaiServiceUrl() {
-//    return Config.getConfigration().getMsbServerAddr() + "/aai/v11/";
-//  }
+  public EsrSystemInfo getEsrSystemInfoList() {
+    return esrSystemInfoList;
+  }

 
 

+  public void setEsrSystemInfoList(EsrSystemInfo esrSystemInfoList) {
+    this.esrSystemInfoList = esrSystemInfoList;
+  }

 }
 }

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrThirdpartySdnc.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrThirdpartySdnc.java
new file mode 100644 (file)
index 0000000..a4fad11
--- /dev/null
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrThirdpartySdnc.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onap.aai.esr.entity.aai;
+
+public class EsrThirdpartySdnc {
+
+  private String thirdpartySdncId;
+  
+  private String location;
+  
+  private String productName;
+  
+  private EsrSystemInfoList esrSystemInfoList;
+
+  public String getThirdpartySdncId() {
+    return thirdpartySdncId;
+  }
+
+  public void setThirdpartySdncId(String thirdpartySdncId) {
+    this.thirdpartySdncId = thirdpartySdncId;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public void setLocation(String location) {
+    this.location = location;
+  }
+
+  public String getProductName() {
+    return productName;
+  }
+
+  public void setProductName(String productName) {
+    this.productName = productName;
+  }
+
+  public EsrSystemInfoList getEsrSystemInfoList() {
+    return esrSystemInfoList;
+  }
+
+  public void setEsrSystemInfoList(EsrSystemInfoList esrSystemInfoList) {
+    this.esrSystemInfoList = esrSystemInfoList;
+  }
+}

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrVnfm.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrVnfm.java
new file mode 100644 (file)
index 0000000..d6b85e6
--- /dev/null
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrVnfm.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onap.aai.esr.entity.aai;
+
+public class EsrVnfm {
+  
+  private String vnfmId;
+  
+  private String vimId;
+  
+  private String certificateUrl;
+  
+  private EsrSystemInfoList esrSystemInfoList;
+
+  public String getVnfmId() {
+    return vnfmId;
+  }
+
+  public void setVnfmId(String vnfmId) {
+    this.vnfmId = vnfmId;
+  }
+
+  public String getVimId() {
+    return vimId;
+  }
+
+  public void setVimId(String vimId) {
+    this.vimId = vimId;
+  }
+
+  public String getCertificateUrl() {
+    return certificateUrl;
+  }
+
+  public void setCertificateUrl(String certificateUrl) {
+    this.certificateUrl = certificateUrl;
+  }
+
+  public EsrSystemInfoList getEsrSystemInfoList() {
+    return esrSystemInfoList;
+  }
+
+  public void setEsrSystemInfoList(EsrSystemInfoList esrSystemInfoList) {
+    this.esrSystemInfoList = esrSystemInfoList;
+  }
+
+}

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/SdncData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/SdncData.java
deleted file mode 100644 (file)
index c7b022d..0000000
--- a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/SdncData.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Copyright 2016-2017 ZTE Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onap.aai.esr.entity.aai;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-
-
-
-@Entity
-@Table(name = "extsys_sdnc_table")
-@PrimaryKeyJoinColumn(name = "SDNCONTROLLERID")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class SdncData extends BaseData {
-
-  @Column(name = "URL")
-  private String url;
-
-  @Column(name = "USERNAME")
-  private String userName;
-
-  @Column(name = "PASSWORD")
-  private String password;
-
-  @Column(name = "PRODUCTNAME")
-  private String productName;
-
-  @Column(name = "PROTOCOL")
-  private String protocol;
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public String getUserName() {
-    return userName;
-  }
-
-  public void setUserName(String userName) {
-    this.userName = userName;
-  }
-
-  public String getPassword() {
-    return password;
-  }
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-  public String getProductName() {
-    return productName;
-  }
-
-  public void setProductName(String productName) {
-    this.productName = productName;
-  }
-
-  public String getProtocol() {
-    return protocol;
-  }
-
-  public void setProtocol(String protocol) {
-    this.protocol = protocol;
-  }
-
-}

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VimData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VimData.java
deleted file mode 100644 (file)
index 0b546a8..0000000
--- a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VimData.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Copyright 2016-2017 ZTE Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onap.aai.esr.entity.aai;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "extsys_vim_table")
-@PrimaryKeyJoinColumn(name = "VIMID")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class VimData extends BaseData {
-
-
-  @Column(name = "URL")
-  private String url;
-
-  @Column(name = "USERNAME")
-  private String userName;
-
-  @Column(name = "PASSWORD")
-  private String password;
-
-  @Column(name = "DOMAIN")
-  private String domain;
-
-  @Column(name = "TENANT")
-  private String tenant;
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public String getTenant() {
-    return tenant;
-  }
-
-  public void setTenant(String tenant) {
-    this.tenant = tenant;
-  }
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public String getUserName() {
-    return userName;
-  }
-
-  public void setUserName(String userName) {
-    this.userName = userName;
-  }
-
-  public String getPassword() {
-    return password;
-  }
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-}

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VnfmData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VnfmData.java
deleted file mode 100644 (file)
index 795ba96..0000000
--- a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VnfmData.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Copyright 2016-2017 ZTE Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onap.aai.esr.entity.aai;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "extsys_vnfm_table")
-@PrimaryKeyJoinColumn(name = "VNFMID")
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class VnfmData extends BaseData {
-
-  @Column(name = "URL")
-  private String url;
-  @Column(name = "USERNAME")
-  private String userName;
-
-  @Column(name = "PASSWORD")
-  private String password;
-
-  @Column(name = "VIMID")
-  private String vimId;
-
-  @Column(name = "CERTIFICATEURL")
-  private String certificateUrl;
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public String getUserName() {
-    return userName;
-  }
-
-  public void setUserName(String userName) {
-    this.userName = userName;
-  }
-
-  public String getPassword() {
-    return password;
-  }
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-  public String getVimId() {
-    return vimId;
-  }
-
-  public void setVimId(String vimId) {
-    this.vimId = vimId;
-  }
-
-  public String getCertificateUrl() {
-    return certificateUrl;
-  }
-
-  public void setCertificateUrl(String certificateUrl) {
-    this.certificateUrl = certificateUrl;
-  }
-
-}