Av 90644 (#50)

* Certificate added for attach controller, latest model added

* version changed.

Author: tusharlimbhore

o11nplugin-vro-core/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<artifactId>vro</artifactId>
 		<groupId>com.vmware.avi</groupId>
-		<version>20.1.1-beta-2</version>
+		<version>20.1.1</version>
 	</parent>
 
 	<dependencies>

o11nplugin-vro-core/src/main/java/com/vmware/avi/vro/AviVroClient.java

@@ -421,7 +421,7 @@ public HashMap<String, String> getTenantHeader(String tenant) {
 		HashMap<String, String> userHeader = null;
 		if (tenant != null) {
 			userHeader = new HashMap<String, String>();
-			userHeader.put("X-Avi-Tenant", tenant);
+			userHeader.put(Constants.FINDER_VRO_X_AVI_TENANT, tenant);
 		}
 		return userHeader;
 	}

o11nplugin-vro-core/src/main/java/com/vmware/avi/vro/Constants.java

@@ -1,7 +1,7 @@
 package com.vmware.avi.vro;
 
 public class Constants {
-
+	public static final String FINDER_VRO_X_AVI_TENANT = "X-Avi-Tenant";
 	public static final String FINDER_VRO_GSLBSITERUNTIME = "GslbSiteRuntime";
 	public static final String FINDER_VRO_AUTHMATCHGROUPMEMBERSHIP = "AuthMatchGroupMembership";
 	public static final String FINDER_VRO_GSLBHEALTHMONITORPROXY = "GslbHealthMonitorProxy";
@@ -962,4 +962,9 @@ public class Constants {
 	public static final String FINDER_VRO_TENANTCONFIGURATION = "TenantConfiguration";
 	public static final String FINDER_VRO_NSXTHOSTS = "NsxtHosts";
 	public static final String FINDER_VRO_ICAPPROFILE = "IcapProfile";
+	public static final String FINDER_VRO_IPREPUTATIONCONFIG = "IpReputationConfig";
+	public static final String FINDER_VRO_SEBGPPEERDOWNDETAILS = "SeBgpPeerDownDetails";
+	public static final String FINDER_VRO_NSXTIMAGEDETAILS = "NsxtImageDetails";
+	public static final String FINDER_VRO_IPTHREATDBEVENTDATA = "IPThreatDBEventData";
+
 }

o11nplugin-vro-core/src/main/java/com/vmware/avi/vro/VroPlugin.java

@@ -27,45 +27,6 @@ public static VroPlugin createScriptingSingleton(IPluginFactory factory) {
 		return ((AbstractSpringPluginFactory) factory).createScriptingObject(VroPlugin.class);
 	}
 
-	/***
-	 * Method will create AVI API session.
-	 * 
-	 * @param controller controller IP.
-	 * @param username   username of the controller.
-	 * @param password   password of the controller.
-	 * @param tenant     tenant name.
-	 * @param version    version.
-	 * @return instance of AviVroClient
-	 */
-	@VsoMethod
-	public AviVroClient connect(String controller, String username, String password, String tenant, String version) {
-		AviCredentials creds = new AviCredentials(controller, username, password);
-		creds.setTenant(tenant);
-		creds.setVersion(version);
-		service.setCred(creds);
-		return service;
-	}
-
-	/***
-	 * Method will create AVI API session.
-	 * 
-	 * @param controller controller IP.
-	 * @token token for authentication.
-	 * @param tenant  tenant name.
-	 * @param version version.
-	 * @return instance of AviVroClient
-	 */
-	@VsoMethod
-	public AviVroClient connect(String controller, String token, String tenant, String version) {
-		AviCredentials creds = new AviCredentials();
-		creds.setController(controller);
-		creds.setToken(token);
-		creds.setTenant(tenant);
-		creds.setVersion(version);
-		service.setCred(creds);
-		return service;
-	}
-
 	/***
 	 * Method will create AVI API session.
 	 * 

o11nplugin-vro-core/src/main/java/com/vmware/avi/vro/model/ALBServicesAccount.java

@@ -131,9 +131,9 @@ public boolean equals(java.lang.Object o) {
     return false;
   }
   ALBServicesAccount objALBServicesAccount = (ALBServicesAccount) o;
-  return   Objects.equals(this.users, objALBServicesAccount.users)&&
-  Objects.equals(this.name, objALBServicesAccount.name)&&
-  Objects.equals(this.id, objALBServicesAccount.id);
+  return   Objects.equals(this.name, objALBServicesAccount.name)&&
+  Objects.equals(this.id, objALBServicesAccount.id)&&
+  Objects.equals(this.users, objALBServicesAccount.users);
 }
 
 @Override

o11nplugin-vro-core/src/main/java/com/vmware/avi/vro/model/ALBServicesAccountUser.java

@@ -109,9 +109,9 @@ public boolean equals(java.lang.Object o) {
     return false;
   }
   ALBServicesAccountUser objALBServicesAccountUser = (ALBServicesAccountUser) o;
-  return   Objects.equals(this.phone, objALBServicesAccountUser.phone)&&
-  Objects.equals(this.name, objALBServicesAccountUser.name)&&
-  Objects.equals(this.email, objALBServicesAccountUser.email);
+  return   Objects.equals(this.name, objALBServicesAccountUser.name)&&
+  Objects.equals(this.email, objALBServicesAccountUser.email)&&
+  Objects.equals(this.phone, objALBServicesAccountUser.phone);
 }
 
 @Override

o11nplugin-vro-core/src/main/java/com/vmware/avi/vro/model/ALBServicesCase.java

@@ -665,31 +665,31 @@ public boolean equals(java.lang.Object o) {
     return false;
   }
   ALBServicesCase objALBServicesCase = (ALBServicesCase) o;
-  return   Objects.equals(this.contactInfo, objALBServicesCase.contactInfo)&&
-  Objects.equals(this.lastModifiedDate, objALBServicesCase.lastModifiedDate)&&
-  Objects.equals(this.customTag, objALBServicesCase.customTag)&&
-  Objects.equals(this.caseNumber, objALBServicesCase.caseNumber)&&
+  return   Objects.equals(this.assetId, objALBServicesCase.assetId)&&
   Objects.equals(this.id, objALBServicesCase.id)&&
-  Objects.equals(this.deploymentEnvironment, objALBServicesCase.deploymentEnvironment)&&
-  Objects.equals(this.assetId, objALBServicesCase.assetId)&&
-  Objects.equals(this.frUseCases, objALBServicesCase.frUseCases)&&
-  Objects.equals(this.severity, objALBServicesCase.severity)&&
+  Objects.equals(this.caseNumber, objALBServicesCase.caseNumber)&&
   Objects.equals(this.caseStatus, objALBServicesCase.caseStatus)&&
-  Objects.equals(this.environment, objALBServicesCase.environment)&&
-  Objects.equals(this.version, objALBServicesCase.version)&&
   Objects.equals(this.subject, objALBServicesCase.subject)&&
-  Objects.equals(this.type, objALBServicesCase.type)&&
-  Objects.equals(this.email, objALBServicesCase.email)&&
-  Objects.equals(this.caseAttachments, objALBServicesCase.caseAttachments)&&
+  Objects.equals(this.caseCreatedBy, objALBServicesCase.caseCreatedBy)&&
+  Objects.equals(this.createdDate, objALBServicesCase.createdDate)&&
+  Objects.equals(this.lastModifiedDate, objALBServicesCase.lastModifiedDate)&&
   Objects.equals(this.status, objALBServicesCase.status)&&
-  Objects.equals(this.frCurrentSolution, objALBServicesCase.frCurrentSolution)&&
+  Objects.equals(this.version, objALBServicesCase.version)&&
+  Objects.equals(this.patchVersion, objALBServicesCase.patchVersion)&&
   Objects.equals(this.description, objALBServicesCase.description)&&
-  Objects.equals(this.caseCreatedBy, objALBServicesCase.caseCreatedBy)&&
+  Objects.equals(this.type, objALBServicesCase.type)&&
+  Objects.equals(this.environment, objALBServicesCase.environment)&&
+  Objects.equals(this.deploymentEnvironment, objALBServicesCase.deploymentEnvironment)&&
+  Objects.equals(this.severity, objALBServicesCase.severity)&&
   Objects.equals(this.time, objALBServicesCase.time)&&
+  Objects.equals(this.customTag, objALBServicesCase.customTag)&&
+  Objects.equals(this.caseAttachments, objALBServicesCase.caseAttachments)&&
+  Objects.equals(this.email, objALBServicesCase.email)&&
+  Objects.equals(this.contactInfo, objALBServicesCase.contactInfo)&&
+  Objects.equals(this.frUseCases, objALBServicesCase.frUseCases)&&
+  Objects.equals(this.frCurrentSolution, objALBServicesCase.frCurrentSolution)&&
   Objects.equals(this.frBusinessJustification, objALBServicesCase.frBusinessJustification)&&
-  Objects.equals(this.frTiming, objALBServicesCase.frTiming)&&
-  Objects.equals(this.patchVersion, objALBServicesCase.patchVersion)&&
-  Objects.equals(this.createdDate, objALBServicesCase.createdDate);
+  Objects.equals(this.frTiming, objALBServicesCase.frTiming);
 }
 
 @Override

o11nplugin-vro-core/src/main/java/com/vmware/avi/vro/model/ALBServicesConfig.java

@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.vmware.avi.vro.model.ALBServicesUser;
 import com.vmware.avi.vro.model.PortalFeatureOptIn;
+import com.vmware.avi.vro.model.IpReputationConfig;
 import com.vmware.avi.vro.model.ProactiveSupportDefaults;
 import com.vmware.avi.vro.model.ProxyConfiguration;
 import com.vmware.o11n.plugin.sdk.annotation.VsoFinder;
@@ -36,9 +37,9 @@ public class ALBServicesConfig extends AviRestResource {
   @JsonInclude(Include.NON_NULL)
   private PortalFeatureOptIn featureOptInStatus = null;
 
-  @JsonProperty("ip_reputation_sync_interval")
+  @JsonProperty("ip_reputation_config")
   @JsonInclude(Include.NON_NULL)
-  private Integer ipReputationSyncInterval = 60;
+  private IpReputationConfig ipReputationConfig = null;
 
   @JsonProperty("polling_interval")
   @JsonInclude(Include.NON_NULL)
@@ -60,9 +61,9 @@ public class ALBServicesConfig extends AviRestResource {
   @JsonInclude(Include.NON_NULL)
   private String url = "url";
 
-  @JsonProperty("use_system_proxy")
+  @JsonProperty("use_split_proxy")
   @JsonInclude(Include.NON_NULL)
-  private Boolean useSystemProxy = true;
+  private Boolean useSplitProxy = false;
 
   @JsonProperty("uuid")
   @JsonInclude(Include.NON_NULL)
@@ -116,28 +117,24 @@ public void setFeatureOptInStatus(PortalFeatureOptIn featureOptInStatus) {
 
   /**
    * This is the getter method this will return the attribute value.
-   * Ip reputation db sync interval in minutes.
-   * Allowed values are 2-1440.
+   * Default values to be used for ip reputation sync.
    * Field introduced in 20.1.1.
-   * Default value when not specified in API or module is interpreted by Avi Controller as 60.
-   * @return ipReputationSyncInterval
+   * @return ipReputationConfig
    */
   @VsoMethod
-  public Integer getIpReputationSyncInterval() {
-    return ipReputationSyncInterval;
+  public IpReputationConfig getIpReputationConfig() {
+    return ipReputationConfig;
   }
 
   /**
    * This is the setter method to the attribute.
-   * Ip reputation db sync interval in minutes.
-   * Allowed values are 2-1440.
+   * Default values to be used for ip reputation sync.
    * Field introduced in 20.1.1.
-   * Default value when not specified in API or module is interpreted by Avi Controller as 60.
-   * @param ipReputationSyncInterval set the ipReputationSyncInterval.
+   * @param ipReputationConfig set the ipReputationConfig.
    */
   @VsoMethod
-  public void setIpReputationSyncInterval(Integer  ipReputationSyncInterval) {
-    this.ipReputationSyncInterval = ipReputationSyncInterval;
+  public void setIpReputationConfig(IpReputationConfig ipReputationConfig) {
+    this.ipReputationConfig = ipReputationConfig;
   }
 
   /**
@@ -253,26 +250,26 @@ public void setUrl(String  url) {
 
   /**
    * This is the getter method this will return the attribute value.
-   * By default, use system proxy configurationif false, use split proxy configuration.
+   * By default, use system proxy configuration.if true, use split proxy configuration.
    * Field introduced in 20.1.1.
-   * Default value when not specified in API or module is interpreted by Avi Controller as true.
-   * @return useSystemProxy
+   * Default value when not specified in API or module is interpreted by Avi Controller as false.
+   * @return useSplitProxy
    */
   @VsoMethod
-  public Boolean getUseSystemProxy() {
-    return useSystemProxy;
+  public Boolean getUseSplitProxy() {
+    return useSplitProxy;
   }
 
   /**
    * This is the setter method to the attribute.
-   * By default, use system proxy configurationif false, use split proxy configuration.
+   * By default, use system proxy configuration.if true, use split proxy configuration.
    * Field introduced in 20.1.1.
-   * Default value when not specified in API or module is interpreted by Avi Controller as true.
-   * @param useSystemProxy set the useSystemProxy.
+   * Default value when not specified in API or module is interpreted by Avi Controller as false.
+   * @param useSplitProxy set the useSplitProxy.
    */
   @VsoMethod
-  public void setUseSystemProxy(Boolean  useSystemProxy) {
-    this.useSystemProxy = useSystemProxy;
+  public void setUseSplitProxy(Boolean  useSplitProxy) {
+    this.useSplitProxy = useSplitProxy;
   }
 
   /**
@@ -310,14 +307,14 @@ public boolean equals(java.lang.Object o) {
   }
   ALBServicesConfig objALBServicesConfig = (ALBServicesConfig) o;
   return   Objects.equals(this.uuid, objALBServicesConfig.uuid)&&
-  Objects.equals(this.ipReputationSyncInterval, objALBServicesConfig.ipReputationSyncInterval)&&
-  Objects.equals(this.proactiveSupportDefaults, objALBServicesConfig.proactiveSupportDefaults)&&
   Objects.equals(this.portalUrl, objALBServicesConfig.portalUrl)&&
+  Objects.equals(this.pollingInterval, objALBServicesConfig.pollingInterval)&&
+  Objects.equals(this.assetContact, objALBServicesConfig.assetContact)&&
   Objects.equals(this.featureOptInStatus, objALBServicesConfig.featureOptInStatus)&&
+  Objects.equals(this.proactiveSupportDefaults, objALBServicesConfig.proactiveSupportDefaults)&&
+  Objects.equals(this.useSplitProxy, objALBServicesConfig.useSplitProxy)&&
   Objects.equals(this.splitProxyConfiguration, objALBServicesConfig.splitProxyConfiguration)&&
-  Objects.equals(this.assetContact, objALBServicesConfig.assetContact)&&
-  Objects.equals(this.useSystemProxy, objALBServicesConfig.useSystemProxy)&&
-  Objects.equals(this.pollingInterval, objALBServicesConfig.pollingInterval);
+  Objects.equals(this.ipReputationConfig, objALBServicesConfig.ipReputationConfig);
 }
 
 @Override
@@ -326,12 +323,12 @@ public String toString() {
   sb.append("class ALBServicesConfig {\n");
       sb.append("    assetContact: ").append(toIndentedString(assetContact)).append("\n");
         sb.append("    featureOptInStatus: ").append(toIndentedString(featureOptInStatus)).append("\n");
-        sb.append("    ipReputationSyncInterval: ").append(toIndentedString(ipReputationSyncInterval)).append("\n");
+        sb.append("    ipReputationConfig: ").append(toIndentedString(ipReputationConfig)).append("\n");
         sb.append("    pollingInterval: ").append(toIndentedString(pollingInterval)).append("\n");
         sb.append("    portalUrl: ").append(toIndentedString(portalUrl)).append("\n");
         sb.append("    proactiveSupportDefaults: ").append(toIndentedString(proactiveSupportDefaults)).append("\n");
         sb.append("    splitProxyConfiguration: ").append(toIndentedString(splitProxyConfiguration)).append("\n");
-            sb.append("    useSystemProxy: ").append(toIndentedString(useSystemProxy)).append("\n");
+            sb.append("    useSplitProxy: ").append(toIndentedString(useSplitProxy)).append("\n");
         sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
       sb.append("}");
   return sb.toString();

o11nplugin-vro-core/src/main/java/com/vmware/avi/vro/model/ALBServicesFileUpload.java

@@ -273,14 +273,14 @@ public boolean equals(java.lang.Object o) {
     return false;
   }
   ALBServicesFileUpload objALBServicesFileUpload = (ALBServicesFileUpload) o;
-  return   Objects.equals(this.status, objALBServicesFileUpload.status)&&
-  Objects.equals(this.uuid, objALBServicesFileUpload.uuid)&&
-  Objects.equals(this.filePath, objALBServicesFileUpload.filePath)&&
+  return   Objects.equals(this.uuid, objALBServicesFileUpload.uuid)&&
+  Objects.equals(this.name, objALBServicesFileUpload.name)&&
+  Objects.equals(this.tenantRef, objALBServicesFileUpload.tenantRef)&&
   Objects.equals(this.caseId, objALBServicesFileUpload.caseId)&&
-  Objects.equals(this.error, objALBServicesFileUpload.error)&&
   Objects.equals(this.s3Directory, objALBServicesFileUpload.s3Directory)&&
-  Objects.equals(this.tenantRef, objALBServicesFileUpload.tenantRef)&&
-  Objects.equals(this.name, objALBServicesFileUpload.name);
+  Objects.equals(this.status, objALBServicesFileUpload.status)&&
+  Objects.equals(this.error, objALBServicesFileUpload.error)&&
+  Objects.equals(this.filePath, objALBServicesFileUpload.filePath);
 }
 
 @Override

o11nplugin-vro-core/src/main/java/com/vmware/avi/vro/model/ALBServicesStatusDetails.java

@@ -119,9 +119,9 @@ public boolean equals(java.lang.Object o) {
     return false;
   }
   ALBServicesStatusDetails objALBServicesStatusDetails = (ALBServicesStatusDetails) o;
-  return   Objects.equals(this.connectivity, objALBServicesStatusDetails.connectivity)&&
-  Objects.equals(this.reason, objALBServicesStatusDetails.reason)&&
-  Objects.equals(this.registration, objALBServicesStatusDetails.registration);
+  return   Objects.equals(this.registration, objALBServicesStatusDetails.registration)&&
+  Objects.equals(this.connectivity, objALBServicesStatusDetails.connectivity)&&
+  Objects.equals(this.reason, objALBServicesStatusDetails.reason);
 }
 
 @Override