diff --git a/README.md b/README.md
index 9951c27aea0..d0d77bd3118 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ JDK 1.8.
 
 ## Supported OnPrem vCenter Releases:
 
-vCenter 6.0, 6.5, 6.7, 6.7U1, 6.7U2, 6.7U3
+vCenter 6.0, 6.5, 6.7, 6.7U1, 6.7U2, 6.7U3, 7.0
 
 Please refer to the notes in each sample for detailed compatibility information. 
 
@@ -88,9 +88,9 @@ When running the samples, parameters can be provided either on the command line,
 
 Use a command like the following to display usage information for a particular sample.
 ```` bash
-$java -ea -cp target/vsphere-samples-7.0.0.jar vmware.samples.vcenter.vm.list.ListVMs
+$java -ea -cp target/vsphere-samples-7.0.0.1.jar vmware.samples.vcenter.vm.list.ListVMs
 
-java -cp target/vsphere-samples-7.0.0.jar vmware.samples.vcenter.vm.list.ListVMs [--config-file <CONFIGURATION FILE>]
+java -cp target/vsphere-samples-7.0.0.1.jar vmware.samples.vcenter.vm.list.ListVMs [--config-file <CONFIGURATION FILE>]
        --server <SERVER> --username <USERNAME> --password <PASSWORD> --cluster <CLUSTER> [--truststorepath <ABSOLUTE PATH OF JAVA TRUSTSTORE FILE>]
        [--truststorepassword <JAVA TRUSTSTORE PASSWORD>] [--cleardata] [--skip-server-verification]
 
@@ -114,17 +114,17 @@ Sample Options:
 
 Use a command like the following to run a sample using only command line parameters:
 ```` bash
-$java -ea -cp target/vsphere-samples-7.0.0.jar vmware.samples.vcenter.vm.list.ListVMs --server servername --username administrator@vsphere.local --password password --skip-server-verification
+$java -ea -cp target/vsphere-samples-7.0.0.1.jar vmware.samples.vcenter.vm.list.ListVMs --server servername --username administrator@vsphere.local --password password --skip-server-verification
 ````
 
 Use a command like the following to run a sample using only a configuration file:
 ```` bash
-$java -ea -cp target/vsphere-samples-7.0.0.jar vmware.samples.vcenter.vm.list.ListVMs --config-file sample.properties
+$java -ea -cp target/vsphere-samples-7.0.0.1.jar vmware.samples.vcenter.vm.list.ListVMs --config-file sample.properties
 ````
 
 Use the following command to run the sample using a combination of configuration file and command line parameters:
 ```` bash
-$java -ea -cp target/vsphere-samples-7.0.0.jar vmware.samples.vcenter.vm.list.ListVMs --config-file sample.properties --server servername
+$java -ea -cp target/vsphere-samples-7.0.0.1.jar vmware.samples.vcenter.vm.list.ListVMs --config-file sample.properties --server servername
 ````
 
 ### Importing the samples to eclipse
@@ -150,12 +150,12 @@ This will import a basic sample class to your package, which you can then custom
 ## API Documentation
 
 ### vSphere API Documentation
+* [VMware vSphere APIs 7.0.0.1 (latest version)](https://vmware.github.io/vsphere-automation-sdk-java/vsphere/7.0.0.1/vsphereautomation-client-sdk/index.html).
 
 * [VMware Cloud on AWS vSphere (latest version)](https://vmware.github.io/vsphere-automation-sdk-java/vsphere/cloud/vsphereautomation-client-sdk/index.html).
 
-* [VMware vSphere APIs 6.7.3 (latest version)](https://vmware.github.io/vsphere-automation-sdk-java/vsphere/6.7.3/vsphereautomation-client-sdk/index.html).
-
-* Previous releases: [6.5](https://vmware.github.io/vsphere-automation-sdk-java/vsphere/6.5.0/vsphereautomation-client-sdk/index.html), [6.7.1](https://vmware.github.io/vsphere-automation-sdk-java/vsphere/6.7.1/vsphereautomation-client-sdk/index.html)
+* Previous releases: [6.7.3](https://vmware.github.io/vsphere-automation-sdk-java/vsphere/6.7.3/vsphereautomation-client-sdk/index.html),
+[6.7.1](https://vmware.github.io/vsphere-automation-sdk-java/vsphere/6.7.1/vsphereautomation-client-sdk/index.html)
 
 ### VMware Cloud on AWS API Documentation
 
@@ -229,8 +229,8 @@ Sample Exchange can be allowed to access your GitHub resources, by way of a link
 Board members are volunteers from the SDK community and VMware staff members, board members are not held responsible for any issues which may occur from running of samples from this repository.
 
 Members:
-* Kunal Singh (VMware)
-* Jobin Jeorge (VMware)
+* Sumit Agrawal (VMware)
+* Shyla Srinivas (VMware)
 
 ### Approval of Additions
 Items added to the repository, including items from the Board members, require 2 votes from the board members before being added to the repository. The approving members will have ideally downloaded and tested the item. When two “Approved for Merge” comments are added from board members, the pull can then be committed to the repository.
@@ -240,5 +240,6 @@ Items added to the repository, including items from the Board members, require 2
 * [vSphere Automation SDK Overview](http://pubs.vmware.com/vsphere-65/index.jsp#com.vmware.vapi.progguide.doc/GUID-AF73991C-FC1C-47DF-8362-184B6544CFDE.html)
 * [VMware Code](https://code.vmware.com/home)
 * [VMware Developer Community](https://communities.vmware.com/community/vmtn/developer)
-* VMware vSphere [Java API Reference documentation](https://vmware.github.io/vsphere-automation-sdk-java/vsphere/6.7.3/vsphereautomation-client-sdk/index.html).
+* VMware vSphere [Java API Reference documentation](https://vmware.github.io/vsphere-automation-sdk-java/vsphere/7.0.0.1/vsphereautomation-client-sdk/index.html).
+
 * [VMware Java forum](https://code.vmware.com/forums/7508/vsphere-automation-sdk-for-java)
diff --git a/lib/oidc-oauth2-sdk-0.0.1.jar b/lib/oidc-oauth2-sdk-0.0.1.jar
new file mode 100644
index 00000000000..90a474072c9
Binary files /dev/null and b/lib/oidc-oauth2-sdk-0.0.1.jar differ
diff --git a/lib/vapi-authentication-2.14.0-javadoc.jar b/lib/vapi-authentication-2.14.0-javadoc.jar
deleted file mode 100644
index f74358f675c..00000000000
Binary files a/lib/vapi-authentication-2.14.0-javadoc.jar and /dev/null differ
diff --git a/lib/vapi-authentication-2.15.0-javadoc.jar b/lib/vapi-authentication-2.15.0-javadoc.jar
new file mode 100644
index 00000000000..e94b978ec9a
Binary files /dev/null and b/lib/vapi-authentication-2.15.0-javadoc.jar differ
diff --git a/lib/vapi-authentication-2.14.0.jar b/lib/vapi-authentication-2.15.0.jar
similarity index 81%
rename from lib/vapi-authentication-2.14.0.jar
rename to lib/vapi-authentication-2.15.0.jar
index b48ef764674..189f9a44aea 100644
Binary files a/lib/vapi-authentication-2.14.0.jar and b/lib/vapi-authentication-2.15.0.jar differ
diff --git a/lib/vapi-runtime-2.14.0-javadoc.jar b/lib/vapi-runtime-2.14.0-javadoc.jar
deleted file mode 100644
index 8e4ca8f3a1f..00000000000
Binary files a/lib/vapi-runtime-2.14.0-javadoc.jar and /dev/null differ
diff --git a/lib/vapi-runtime-2.15.0-javadoc.jar b/lib/vapi-runtime-2.15.0-javadoc.jar
new file mode 100644
index 00000000000..f1c36d18a73
Binary files /dev/null and b/lib/vapi-runtime-2.15.0-javadoc.jar differ
diff --git a/lib/vapi-runtime-2.14.0.jar b/lib/vapi-runtime-2.15.0.jar
similarity index 75%
rename from lib/vapi-runtime-2.14.0.jar
rename to lib/vapi-runtime-2.15.0.jar
index 40a31cb2ce8..51441fda74a 100644
Binary files a/lib/vapi-runtime-2.14.0.jar and b/lib/vapi-runtime-2.15.0.jar differ
diff --git a/lib/vapi-samltoken-2.14.0-javadoc.jar b/lib/vapi-samltoken-2.14.0-javadoc.jar
deleted file mode 100644
index efe42311857..00000000000
Binary files a/lib/vapi-samltoken-2.14.0-javadoc.jar and /dev/null differ
diff --git a/lib/vapi-samltoken-2.15.0-javadoc.jar b/lib/vapi-samltoken-2.15.0-javadoc.jar
new file mode 100644
index 00000000000..177fa0ab9c0
Binary files /dev/null and b/lib/vapi-samltoken-2.15.0-javadoc.jar differ
diff --git a/lib/vapi-samltoken-2.14.0.jar b/lib/vapi-samltoken-2.15.0.jar
similarity index 85%
rename from lib/vapi-samltoken-2.14.0.jar
rename to lib/vapi-samltoken-2.15.0.jar
index 5968c6fd362..8d3bd13c45a 100644
Binary files a/lib/vapi-samltoken-2.14.0.jar and b/lib/vapi-samltoken-2.15.0.jar differ
diff --git a/lib/vapi-vmc-sdk-2.14.0.jar b/lib/vapi-vmc-sdk-2.14.0.jar
deleted file mode 100644
index 09d1cd7a0a5..00000000000
Binary files a/lib/vapi-vmc-sdk-2.14.0.jar and /dev/null differ
diff --git a/lib/vapi-vmc-sdk-2.15.0.jar b/lib/vapi-vmc-sdk-2.15.0.jar
new file mode 100644
index 00000000000..3ebd1788448
Binary files /dev/null and b/lib/vapi-vmc-sdk-2.15.0.jar differ
diff --git a/lib/vsphereautomation-client-sdk-3.2.0-javadoc.jar b/lib/vsphereautomation-client-sdk-3.3.0-javadoc.jar
similarity index 60%
rename from lib/vsphereautomation-client-sdk-3.2.0-javadoc.jar
rename to lib/vsphereautomation-client-sdk-3.3.0-javadoc.jar
index f877261b917..77ad21ba150 100644
Binary files a/lib/vsphereautomation-client-sdk-3.2.0-javadoc.jar and b/lib/vsphereautomation-client-sdk-3.3.0-javadoc.jar differ
diff --git a/lib/vsphereautomation-client-sdk-3.2.0.jar b/lib/vsphereautomation-client-sdk-3.3.0.jar
similarity index 67%
rename from lib/vsphereautomation-client-sdk-3.2.0.jar
rename to lib/vsphereautomation-client-sdk-3.3.0.jar
index 8c24424986e..532f748131a 100644
Binary files a/lib/vsphereautomation-client-sdk-3.2.0.jar and b/lib/vsphereautomation-client-sdk-3.3.0.jar differ
diff --git a/lib/vsphereautomation-lookupservice-1.0.0-javadoc.jar b/lib/vsphereautomation-lookupservice-1.0.0-javadoc.jar
index 54cf517fe0c..2665a764c70 100644
Binary files a/lib/vsphereautomation-lookupservice-1.0.0-javadoc.jar and b/lib/vsphereautomation-lookupservice-1.0.0-javadoc.jar differ
diff --git a/lib/vsphereautomation-lookupservice-1.0.0.jar b/lib/vsphereautomation-lookupservice-1.0.0.jar
index ddae19b8c47..bfd644a2584 100644
Binary files a/lib/vsphereautomation-lookupservice-1.0.0.jar and b/lib/vsphereautomation-lookupservice-1.0.0.jar differ
diff --git a/pom.xml b/pom.xml
index 27447121a0e..2f8fdc9702c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.vmware</groupId>
   <artifactId>vsphere-samples-nodeps</artifactId>
-  <version>7.0.0</version>
+  <version>7.0.0.1</version>
   <packaging>jar</packaging>
 
   <name>samples</name>
@@ -12,7 +12,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <vapi.version>2.14.0</vapi.version>
+    <vapi.version>2.15.0</vapi.version>
     <slf4j.version>1.7.12</slf4j.version>
     <httpclient.version>4.5.10</httpclient.version>
     <httpasyncclient.version>4.1.4</httpasyncclient.version>
@@ -24,12 +24,13 @@
     <commons-beanutils.version>1.9.4</commons-beanutils.version>
     <lookupservice.version>1.0.0</lookupservice.version>
     <vspherewssdk.version>6.7.3</vspherewssdk.version>
-    <vsphereautomationsdk.version>3.2.0</vsphereautomationsdk.version>
+    <vsphereautomationsdk.version>3.3.0</vsphereautomationsdk.version>
     <vmc.version>1.24.0</vmc.version>
     <nsxpolicysdk.version>2.5.1.0.1.15419398</nsxpolicysdk.version>
     <nsxvmcawsint.version>2.5.1.0.1.15419398</nsxvmcawsint.version>
     <nsxvmcsdkcommon.version>2.5.1.0.1.15419398</nsxvmcsdkcommon.version>
     <vmc.draas.version>1.9.0</vmc.draas.version>
+    <oidc-oauth2.version>0.0.1</oidc-oauth2.version>
   </properties>
   <build>
     <plugins>
@@ -51,6 +52,20 @@
         <artifactId>maven-install-plugin</artifactId>
         <version>2.3.1</version>
         <executions>
+          <execution>
+            <id>install-oidc-oauth2-sdk</id>
+            <phase>initialize</phase>
+            <goals>
+              <goal>install-file</goal>
+            </goals>
+            <configuration>
+              <packaging>jar</packaging>
+              <groupId>com.vmware.vapi</groupId>
+              <artifactId>oidc-oauth2-sdk</artifactId>
+              <version>${oidc-oauth2.version}</version>
+              <file>./lib/oidc-oauth2-sdk-${oidc-oauth2.version}.jar</file>
+            </configuration>
+          </execution>
          <execution>
            <id>install-draas-bindings</id>
            <phase>initialize</phase>
@@ -296,6 +311,11 @@
    </plugins>
  </build>
 <dependencies>
+  <dependency>
+    <groupId>com.vmware.vapi</groupId>
+    <artifactId>oidc-oauth2-sdk</artifactId>
+    <version>${oidc-oauth2.version}</version>
+  </dependency>
   <dependency>
    <groupId>com.vmware.vmc</groupId>
    <artifactId>vmc-draas-bindings</artifactId>
diff --git a/src/main/java/vmware/samples/common/AuthorizationConstants.java b/src/main/java/vmware/samples/common/AuthorizationConstants.java
new file mode 100644
index 00000000000..142d1dd02ca
--- /dev/null
+++ b/src/main/java/vmware/samples/common/AuthorizationConstants.java
@@ -0,0 +1,8 @@
+package vmware.samples.common;
+
+public class AuthorizationConstants {
+    public static final String CLIENT_ID="clientId";
+    public static final String CLIENT_SECRET="clientSecret";
+    public static final String REDIRECT_URI="redirect_uri";
+    public static final String REDIRECT_URIS="redirectUris";
+}
diff --git a/src/main/java/vmware/samples/common/AuthorizationUtil.java b/src/main/java/vmware/samples/common/AuthorizationUtil.java
new file mode 100644
index 00000000000..480d315ee7e
--- /dev/null
+++ b/src/main/java/vmware/samples/common/AuthorizationUtil.java
@@ -0,0 +1,63 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+package vmware.samples.common;
+
+import java.util.Map;
+
+import com.vmware.authorization.AuthorizationRequestExecutor;
+import com.vmware.authorization.Constants;
+import com.vmware.authorization.IDPFactory;
+import com.vmware.authorization.IdentityProviderType;
+import com.vmware.authorization.grant.AuthorizationGrant;
+import com.vmware.vapi.bindings.Service;
+import com.vmware.vapi.bindings.StubConfiguration;
+import com.vmware.vapi.protocol.HttpConfiguration;
+import com.vmware.vapi.saml.SamlToken;
+
+import vmware.samples.common.authentication.VapiAuthenticationHelper;
+import vmware.samples.vcenter.identity.helpers.VcenterIdentityProvider;
+import vmware.samples.vcenter.identity.helpers.VcenterTokenExchange;
+
+public class AuthorizationUtil {
+	
+	private AuthorizationUtil() {}
+
+	public static IdentityProviderType getDefaultIdentityProviderWithType(String vcenterServer,
+			boolean skipServerVerification) throws Exception {
+		VcenterIdentityProvider vip = new VcenterIdentityProvider();
+        IdentityProviderType identityType = vip.getDefaultIdentityProviderWithType(vcenterServer,
+        		skipServerVerification);
+		return identityType;
+		
+	}
+	public static <T extends Service> T getStub(Class<T> serviceClass, IdentityProviderType identityType,
+			AuthorizationGrant grantType, String vcenterServer) throws Exception {
+		
+		AuthorizationRequestExecutor grantExecutor = IDPFactory.getAuthRequestExecutor(identityType.getType(),
+                grantType);
+		 Map<String, String> map = grantExecutor.getAccessAndIdToken();
+		 VcenterTokenExchange tokenSer = new VcenterTokenExchange();
+	     SamlToken samlToken = tokenSer.getSAMLToken(map.get(Constants.ACCESS_TOKEN),
+	                map.get(Constants.ID_TOKEN), vcenterServer);
+	     //System.out.println("SAML Bearer Token :" + samlToken);   
+	     VapiAuthenticationHelper vapiHelper = new VapiAuthenticationHelper();
+	     HttpConfiguration httpConfig = vapiHelper.buildHttpConfiguration(true);
+	     StubConfiguration sessionStubConfig = vapiHelper
+	                .loginBySamlBearerToken(vcenterServer, samlToken, httpConfig);
+	     
+	     return vapiHelper.getStubFactory().createStub(serviceClass,
+	                sessionStubConfig);
+		
+	}
+}
+
diff --git a/src/main/java/vmware/samples/common/ParametersHelper.java b/src/main/java/vmware/samples/common/ParametersHelper.java
index a52218d85b7..7ab3e928d38 100644
--- a/src/main/java/vmware/samples/common/ParametersHelper.java
+++ b/src/main/java/vmware/samples/common/ParametersHelper.java
@@ -1,6 +1,6 @@
 /*
  * *******************************************************
- * Copyright VMware, Inc. 2016.  All Rights Reserved.
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
  * SPDX-License-Identifier: MIT
  * *******************************************************
  *
@@ -12,6 +12,8 @@
  */
 package vmware.samples.common;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -32,13 +34,19 @@
 import org.apache.commons.configuration.ConversionException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+
 /**
  * Helper class for parsing command line options or reading the options from a
  * config file
  */
 public class ParametersHelper {
     private Map<Option, Boolean> optionMap;
+    private  Map<String, Object> parsedOptions;
     private static final String CONFIG_FILE = "config-file";
+    private static final String OAUTH_APP_JSON = "oauth_app_json";
 
     /**
      * Adds the common and sample-specific options to the list of options to
@@ -72,7 +80,7 @@ public ParametersHelper(List<Option> optionList) {
      */
     public Map<String, Object> parse(String[] args, String sampleName)
             throws ParseException, ConfigurationException {
-        Map<String, Object> parsedOptions = new HashMap<String, Object>();
+        parsedOptions = new HashMap<String, Object>();
         if (args.length == 0) {
             printUsage(sampleName);
         }
@@ -97,7 +105,7 @@ public Map<String, Object> parse(String[] args, String sampleName)
         Iterator<Option> optionsIter = optionsToParseFromConfig.iterator();
         if (cmd.hasOption(CONFIG_FILE)) {
             // Read from configuration file first
-        	Configuration config = new PropertiesConfiguration(cmd.getOptionValue(CONFIG_FILE));
+            Configuration config = new PropertiesConfiguration(cmd.getOptionValue(CONFIG_FILE));
             while (optionsIter.hasNext()) {
                 Option option = optionsIter.next();
                 Object optionValue =
@@ -113,7 +121,8 @@ public Map<String, Object> parse(String[] args, String sampleName)
                     parsedOptions.put(option.getLongOpt(), optionValue);
                 }
             }
-        } else {
+        }
+        else {
             optionsToParseFromCmdLine =
                     new ArrayList<Option>(this.optionMap.keySet());
         }
@@ -141,7 +150,6 @@ private Options getOptions(List<Option> optionList) {
         }
         return options;
     }
-
     private Object getOptionValueFromConfig(
         Option option, Configuration config) {
         Object optionValue = null;
@@ -188,11 +196,47 @@ public int compare(Option option1, Option option2) {
 
         });
         formatter.printHelp(150,
-            "\njava -cp target/vsphere-samples-7.0.0.0.jar " + sampleName,
+            "\njava -cp target/vsphere-samples-7.0.0.1.jar " + sampleName,
             "\nSample Options:",
             getOptions(new ArrayList<Option>(this.optionMap.keySet())),
             "",
             true);
         System.exit(0);
     }
+
+    public Map<String, Object> parseJsonConfig(String[] args) {
+        List<Option> optionsToParseFromConfig = new ArrayList<Option>();
+        Iterator<Option> optionIter = this.optionMap.keySet().iterator();
+        while(optionIter.hasNext()) {
+            Option option = (Option)optionIter.next().clone();
+            option.setRequired(false);
+            optionsToParseFromConfig.add(option);
+        }
+        CommandLineParser parser = new DefaultParser();
+        try {
+            CommandLine cmd = parser.parse(
+                getOptions(optionsToParseFromConfig), args);
+           if (cmd.hasOption(OAUTH_APP_JSON) && !(parsedOptions.
+                   containsKey(AuthorizationConstants.CLIENT_SECRET))
+                   && !(parsedOptions.containsKey(AuthorizationConstants.CLIENT_ID))) {
+                JsonNode argsJsonMapper=new ObjectMapper().readTree(new File(cmd.getOptionValue(OAUTH_APP_JSON)));
+                parsedOptions.put(AuthorizationConstants.CLIENT_ID,
+                        argsJsonMapper.get(AuthorizationConstants.CLIENT_ID).asText());
+                parsedOptions.put(AuthorizationConstants.CLIENT_SECRET,
+                        argsJsonMapper.get(AuthorizationConstants.CLIENT_SECRET).asText());
+                if(argsJsonMapper.has(AuthorizationConstants.REDIRECT_URIS)) {
+                    ArrayNode arrayNode=(ArrayNode)argsJsonMapper.get(AuthorizationConstants.REDIRECT_URIS);
+                    parsedOptions.put(AuthorizationConstants.REDIRECT_URI, arrayNode.get(0).asText());
+                }
+           }
+        }catch (IOException e) {
+            System.out.println(e.getMessage());
+            System.exit(0);
+        }
+        catch (ParseException e) {
+            System.out.println(e.getMessage());
+            System.exit(0);
+        }
+        return parsedOptions;
+    }
 }
diff --git a/src/main/java/vmware/samples/common/SslUtil.java b/src/main/java/vmware/samples/common/SslUtil.java
index 311f5e0ff08..17c22a7c398 100644
--- a/src/main/java/vmware/samples/common/SslUtil.java
+++ b/src/main/java/vmware/samples/common/SslUtil.java
@@ -112,14 +112,14 @@ public X509Certificate[] getAcceptedIssuers() {
     public static void trustAllHttpsCertificates() {
         try {
             // Create the trust manager.
-            javax.net.ssl.TrustManager[] trustAllCerts =
-                    new javax.net.ssl.TrustManager[1];
-            javax.net.ssl.TrustManager tm = new TrustAllTrustManager();
+            TrustManager[] trustAllCerts =
+                    new TrustManager[1];
+            TrustManager tm = new TrustAllTrustManager();
             trustAllCerts[0] = tm;
 
             // Create the SSL context
-            javax.net.ssl.SSLContext sc =
-                    javax.net.ssl.SSLContext.getInstance("SSL");
+            SSLContext sc =
+                    SSLContext.getInstance("SSL");
 
             // Create the session context
             javax.net.ssl.SSLSessionContext sslsc =
diff --git a/src/main/java/vmware/samples/common/VcenterAuthorizationStubUtil.java b/src/main/java/vmware/samples/common/VcenterAuthorizationStubUtil.java
new file mode 100644
index 00000000000..e7f90dfed11
--- /dev/null
+++ b/src/main/java/vmware/samples/common/VcenterAuthorizationStubUtil.java
@@ -0,0 +1,354 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+package vmware.samples.common;
+import java.net.URI;
+import java.util.Map;
+import com.vmware.authorization.AuthorizationRequestExecutor;
+import com.vmware.authorization.Constants;
+import com.vmware.authorization.IDPFactory;
+import com.vmware.authorization.IdentityProviderType;
+import com.vmware.authorization.grant.AuthorizationGrant;
+import com.vmware.authorization.grant.oauth2.AuthorizationCodeGrant;
+import com.vmware.authorization.grant.oauth2.ClientCredentialsGrant;
+import com.vmware.authorization.grant.oauth2.RefreshTokenGrant;
+import com.vmware.authorization.grant.oidc.PasswordCredentialsGrant;
+import com.vmware.authorization.id.AuthorizationCodeAndState;
+import com.vmware.authorization.id.Identity;
+import com.vmware.authorization.id.RefreshToken;
+import com.vmware.idp.IDPType;
+import com.vmware.vapi.bindings.Service;
+import com.vmware.vapi.bindings.StubConfiguration;
+import com.vmware.vapi.protocol.HttpConfiguration;
+import com.vmware.vapi.saml.SamlToken;
+import vmware.samples.common.authentication.AuthorizationCodeProvider;
+import vmware.samples.common.authentication.VapiAuthenticationHelper;
+import vmware.samples.vcenter.identity.helpers.VcenterIdentityProvider;
+import vmware.samples.vcenter.identity.helpers.VcenterTokenExchange;
+/**
+ * Description: Utility class to support login using different grant types.
+ * e.g authorization code, client credentials, refresh token and password types.
+  When logged in successfully, It provides the Service Stub stub.
+  Author: VMware, Inc. 
+  Sample Prerequisites: vCenter 7.0 with backed by supported IDPs
+ */
+public class VcenterAuthorizationStubUtil {
+    VapiAuthenticationHelper vapiHelper;
+    public IdentityProviderType getDefaultIdentityProviderWithType(
+            String vcenterServer, boolean skipServerVerification)
+            throws Exception {
+        VcenterIdentityProvider vip = new VcenterIdentityProvider();
+        IdentityProviderType identityType = vip
+                .getDefaultIdentityProviderWithType(vcenterServer,
+                        skipServerVerification);
+        return identityType;
+    }
+    
+    /**
+     * A method to get the session stub configuration using vapi authentication
+     * helper.
+     * @param identityType : includes whether it is OAUTH2, OIDC.
+     * @param grantType : indicates various grant types like auth code, client
+     *                     credentials, refresh token and password types.
+     * @param vcenterServer : server host name or IP address.
+     * @return StubConfiguration object.
+     * @throws Exception
+     */
+    public StubConfiguration getStub(IdentityProviderType identityType,
+            AuthorizationGrant grantType, String vcenterServer)
+            throws Exception {
+        AuthorizationRequestExecutor grantExecutor = IDPFactory
+                .getAuthRequestExecutor(identityType.getType(), grantType);
+        Map<String, String> map = grantExecutor.getAccessAndIdToken();
+        VcenterTokenExchange tokenSer = new VcenterTokenExchange();
+        //TODO: need to convert samlToken to string type as from the following review url.
+        //https://reviewboard.eng.vmware.com/r/1573549/diff/5/
+        SamlToken samlToken = tokenSer.getSAMLToken(
+                map.get(Constants.ACCESS_TOKEN), map.get(Constants.ID_TOKEN),
+                vcenterServer);
+        vapiHelper = new VapiAuthenticationHelper();
+        HttpConfiguration httpConfig = vapiHelper.buildHttpConfiguration(true);
+        StubConfiguration sessionStubConfig = vapiHelper
+                .loginBySamlBearerToken(vcenterServer, samlToken, httpConfig);
+        return sessionStubConfig;
+    }
+    /**
+     * method to login using auth-code grant type, this method accepts only
+     * required parameters for this grant type.
+     * @param server : vcenter server ip address or host name.
+     * @param clientId : client id of the registered app under oauth2 or oidc.
+     * @param clientSecret : indicates client secret of the registered app under
+     *        oauth2 or oidc.
+     * @param redirectUri : redirect uri where actually code and state variables
+     *        are been sent.
+     * @param webServerType : whether local or remote wenb server we need to use.
+     * @param skipServerVerification : flag to skip server authenication or not.
+     * @return session stub config object to mentain login session with Vcenter.
+     * @throws Exception
+     */
+    public StubConfiguration loginUsingAuthCodeGrantType(String server,
+            String clientId, String clientSecret, String redirectUri,
+            String webServerType, boolean skipServerVerification)
+            throws Exception {
+        return loginUsingAuthCodeGrantType(server, clientId, clientSecret,
+                redirectUri, webServerType, null, null, null, null,
+                skipServerVerification);
+    }
+    /**
+     * method to login using auth-code grant type based identity type OIDC or OAUTH2, this method only accepts
+     * required parameters and as well as all optional parameters for this grant
+     * type.
+     * @param server : vcenter server ip address or host name.
+     * @param clientId : client id of the registered app under oauth2 or oidc.
+     * @param clientSecret : indicates client secret of the registered app under
+     *        oauth2 or oidc.
+     * @param redirectUri : redirect uri where actually code and state variables
+     *        are been sent.
+     * @param webServerType : whether local or remote wenb server we need to use.
+     * @param org_id : org id tell under which organization the app is being
+     *        registered.
+     * @param username : users user name associated with identity provider.
+     * @param password : users password associated with identity provider.
+     * @param ref_token : refresh token to refresh the access token and id token.
+     * @param skipServerVerification- tell about to skip server verification or
+     *        not.
+     * @return session stub config object to maintain login session with Vcenter.
+     * @throws Exception
+     */
+    public StubConfiguration loginUsingAuthCodeGrantType(String server,
+            String clientId, String clientSecret, String redirectUri,
+            String webServerType, String org_id, String username,
+            String password, String ref_token, boolean skipServerVerification)
+            throws Exception {
+        IdentityProviderType identityType = getDefaultIdentityProviderWithType(
+                server, skipServerVerification);
+        URI redirectURI = new URI(redirectUri);
+        AuthorizationCodeProvider authProvider = new AuthorizationCodeProvider(
+                identityType, redirectURI.toString(), webServerType);
+        authProvider.openbrowser(server, clientId);
+        AuthorizationCodeAndState codeAndState = authProvider
+                .getAuthorizationCodeAndState();
+        AuthorizationGrant grantType;
+        Identity orgIdentity = getValueForDefaultIdentity(org_id);
+        Identity userIdentity = getValueForDefaultIdentity(username);
+        Identity passwordIdentity = getValueForDefaultIdentity(password);
+        Identity refreshTokenIdentity = getValueForDefaultIdentity(ref_token);
+        if (IDPType.OAUTH2.equals(identityType.getType())) {
+            grantType = new AuthorizationCodeGrant(codeAndState,
+                    identityType.getTokenEndPoint(), redirectURI,
+                    new Identity(clientId), new Identity(clientSecret),
+                    orgIdentity, userIdentity, passwordIdentity,
+                    refreshTokenIdentity);
+        } else {
+            grantType = new com.vmware.authorization.grant.oidc.AuthorizationCodeGrant(
+                    codeAndState, identityType.getTokenEndPoint(), redirectURI,
+                    new Identity(clientId), new Identity(clientSecret));
+        }
+        return getStub(identityType, grantType, server);
+    }
+    /**
+     * This method returns an instance of Identity for a non empty String.
+     * @param paramValue : value passed to method to check is it empty or not.
+     * @return Identity object.
+     */
+    private Identity getValueForDefaultIdentity(String paramValue) {
+        if (isEmpty(paramValue))
+            return null;
+        return new Identity(paramValue);
+    }
+    /**
+     * method to check the parameter value is empty or not.
+     * @param paramValue : value of the parameter.
+     * @return boolean
+     */
+    private boolean isEmpty(String paramValue) {
+        if (null == paramValue || paramValue.isEmpty()) {
+            return true;
+        }
+        return false;
+    }
+    /**
+     * method to get the stub for the particular service class.
+     * @param serviceClass : service class template.
+     * @param sessionStubConfig : session stub object after authentication.
+     * @return service class.
+     */
+    public <T extends Service> T getStub(Class<T> serviceClass,
+            StubConfiguration sessionStubConfig) {
+        return vapiHelper.getStubFactory().createStub(serviceClass,
+                sessionStubConfig);
+    }
+    /**
+     * method to log out from the particular session,
+     */
+    public void logout() {
+        vapiHelper.logout();
+    }
+   /**
+    * method to login using client-credentials grant type, this method only accepts
+    * required parameters for this grant type.
+    * @param server : vcenter server ip address or host name.
+    * @param clientId : client id of the registered app under oauth2 or oidc.
+    * @param clientSecret : indicates client secret of the registered app under
+    * @param orgId : indicates under which org vcenter is been deployed.
+    * @param skipServerVerification : Value to skip server verification or
+    * not.
+    * @return :  session stub config object to maintain login session with Vcenter.
+    * @throws Exception
+    */
+    public StubConfiguration loginUsingClientCredentialsGrantType(String server, String clientId, String clientSecret,
+            String orgId,  boolean skipServerVerification) throws Exception {
+        return loginUsingClientCredentialsGrantType(server, clientId, clientSecret, orgId,
+                null, null, null, null, null, skipServerVerification);
+    }
+    /**
+     * method to login using client-credentials grant type, based identity type OIDC or OAUTH2,this method accepts
+     * required parameters as well as all optional parameters for this grant type.
+     * currently OIDC enabled ADFS does not support client credentials grant type.
+     * @param server : vcenter server ip address or host name.
+     * @param clientId : client id of the registered app under oauth2 or oidc.
+     * @param clientSecret : indicates client secret of the registered app under oauth2 or oidc.
+     * @param orgId : indicates under which org vcenter is been deployed.
+     * @param redirectUri : redirect uri where actually code and state variables
+     * are been sent.
+     * @param username : users user name associated with identity provider.
+     * @param password : users password associated with identity provider.
+     * @param refresh_token : refresh token to refresh the access token and id token.
+     * @param webServerType : whether local or remote wenb server we need to use.
+     * @param skipServerVerification : tell about to skip server verification or
+     * not.
+     * @return : session stub config object to maintain login session with Vcenter.
+     * @throws Exception
+     */
+    public StubConfiguration loginUsingClientCredentialsGrantType(String server,
+            String clientId, String clientSecret, String orgId, String redirectUri,
+            String userName, String passWord, String refresh_token, String webServerType,
+            boolean skipServerVerification) throws Exception {
+        IdentityProviderType identityType = getDefaultIdentityProviderWithType(
+                server, true);
+        AuthorizationGrant clientCredentialsGranttype = null;
+        if (IDPType.OAUTH2.equals(identityType.getType())) {
+            clientCredentialsGranttype = new ClientCredentialsGrant(
+                    identityType.getTokenEndPoint(), new Identity(orgId),
+                    new Identity(clientId), new Identity(clientSecret));
+        }
+        return getStub(identityType, clientCredentialsGranttype, server);
+    }
+    /**
+     * method to login using refresh-token grant type, based on identity type OIDC or OAUTH2,this method accepts
+     * required parameters as well as all optional parameters for this grant type.
+     * @param server : vcenter server ip address or host name.
+     * @param clientId : client id of the registered app under oauth2 or oidc.
+     * @param clientSecret : indicates client secret of the registered app under oauth2 or oidc.
+     * @param refreshToken : refresh token to refresh the access token and id token.
+     * @param skipServerVerification : tell about to skip server verification or not.
+     * @param username : users user name associated with identity provider.
+     * @param password : users password associated with identity provider.
+     * @param orgId : indicates under which org vcenter is been deployed.
+     * @param redirectUri : redirect uri where actually code and state variables
+     * are been sent.
+     * @param serveType : whether local or remote wenb server we need to use.
+     * @return  : session stub config object to maintain login session with Vcenter.
+     * @throws Exception
+     */
+    public StubConfiguration loginUsingRefreshTokenGrantType(String server,
+            String clientId, String clientSecret, String refreshToken,
+            String serveType, String userName, String passWord,
+            String orgId, String redirectUri, boolean skipServerVerification) throws Exception {
+        IdentityProviderType identityType = getDefaultIdentityProviderWithType(
+                server, true);
+        AuthorizationGrant refreshGrantType = null;
+        /**
+         * Get RequestExecutor by passing the RefreshTokenGrant
+         */
+        if (IDPType.OAUTH2.equals(identityType.getType())) {
+            refreshGrantType = new RefreshTokenGrant(
+                    identityType.getTokenEndPoint(),
+                    new RefreshToken(refreshToken), new Identity(clientId),
+                    new Identity(clientSecret));
+        } else {
+            refreshGrantType = new com.vmware.authorization.grant.oidc.RefreshTokenGrant(
+                    identityType.getTokenEndPoint(), new Identity(clientId),
+                    new Identity(clientSecret), new Identity(refreshToken));
+        }
+        return getStub(identityType, refreshGrantType, server);
+    }
+    /**
+     * method to login using refresh-token grant type, this method only accepts
+     * required parameters for this grant type.
+     * @param server : vcenter server ip address or host name.
+     * @param clientId : client id of the registered app under oauth2 or oidc.
+     * @param clientSecret : indicates client secret of the registered app under oauth2 or oidc.
+     * @param refreshToken : refresh token to refresh the access token and id token.
+     * @param skipServerVerification : tells about to skip server verification or not.
+     * @return : session stub config object to maintain login session with Vcenter.
+     * @throws Exception
+     */
+    public StubConfiguration loginUsingRefreshTokenGrantType(String server,
+            String clientId, String clientSecret, String refreshToken,
+            boolean skipServerVerification) throws Exception {
+    return loginUsingRefreshTokenGrantType(server, clientId, clientSecret, refreshToken,
+            null, null, null, null, null, skipServerVerification);
+      }
+    /**
+     * method to login using password grant type, this method accepts all
+     * required parameters as well as optional parameters.
+     * @param server : vcenter server ip address or host name.
+     * @param clientId : client id of the registered app under oauth2 or oidc.
+     * @param clientSecret : indicates client secret of the registered app under oauth2 or oidc.
+     * @param username : users user name associated with identity provider.
+     * @param password : users password associated with identity provider.
+     * @param skipServerVerification : tells about to skip server verification or not.
+     * @param orgId : indicates under which org vcneter is been deployed.
+     * @param redirectUri : redirect uri where actually code and state variables
+     * are been sent.
+     * @param serverType : local or remote web server. For testing purpose, the sample
+     * code shipped along with this SDK will spawn a local webserver.
+     * @param refresh_token : refresh token to refresh the access token and id token.
+     * @return : session stub config object to maintain login session with Vcenter.
+     * @throws Exception
+     */
+    public StubConfiguration loginUsingPasswordGrantType(String server,
+            String clientId, String clientSecret, String userName,
+            String password, String refresh_token, String orgId, String redirectUri,
+            String serverType, boolean skipServerVerification) throws Exception {
+        IdentityProviderType identityType = getDefaultIdentityProviderWithType(
+                server, true);
+        AuthorizationGrant passwordGrantType = null;
+        if (IDPType.OIDC.equals(identityType.getType())) {
+            passwordGrantType = new PasswordCredentialsGrant(
+                    identityType.getTokenEndPoint(), new Identity(clientId),
+                    new Identity(clientSecret), new Identity(userName),
+                    new Identity(password));
+        } else {
+        }
+        return getStub(identityType, passwordGrantType, server);
+    }
+    /**
+     * method to login using password grant type, this method only accepts required parameters.
+     * @param server : vcenter server ip address or host name.
+     * @param clientId : client id of the registered app under oauth2 or oidc.
+     * @param clientSecret : indicates client secret of the registered app under oauth2 or oidc.
+     * @param username : users user name associated with identity provider.
+     * @param password : users password associated with identity provider.
+     * @param skipServerVerification : Value to skip server verification or not.
+     * @return : session stub config object to maintain login session with Vcenter.
+     * @throws Exception
+     */
+    public StubConfiguration loginUsingPasswordGrantType(String server,
+            String clientId, String clientSecret, String userName,
+            String password, boolean skipServerVerification) throws Exception {
+        return loginUsingPasswordGrantType( server,
+                 clientId,  clientSecret,  userName,
+                 password,  null, null, null, null, skipServerVerification);
+    }
+}
diff --git a/src/main/java/vmware/samples/common/authentication/AuthorizationCodeProvider.java b/src/main/java/vmware/samples/common/authentication/AuthorizationCodeProvider.java
new file mode 100644
index 00000000000..a848c0031e1
--- /dev/null
+++ b/src/main/java/vmware/samples/common/authentication/AuthorizationCodeProvider.java
@@ -0,0 +1,110 @@
+package vmware.samples.common.authentication;
+
+import java.awt.Desktop;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
+
+import com.vmware.authorization.IdentityProviderType;
+import com.vmware.authorization.id.AuthorizationCodeAndState;
+
+public class AuthorizationCodeProvider {
+    private SimpleHttpWebServer httpWebServer;
+    private int webServerPort;
+    private String webServer;
+    private IdentityProviderType identityType;
+    private String redirectURI;
+
+    public AuthorizationCodeProvider(IdentityProviderType identityType,
+            String redirectURI, String webServerType) {
+        this.identityType = identityType;
+        this.redirectURI = redirectURI;
+        this.webServer = webServerType;
+    }
+
+    /**
+     * gets the code and state variables from the web server used to access
+     * token,id token.
+     * 
+     * @param uri uri of the web server
+     * @return String containing code and state variables.
+     */
+    private String getAuthCodeAndState(String uri) throws IOException {
+
+        URL url = new URL(uri);
+        HttpURLConnection httpURLConnection = (HttpURLConnection) url
+                .openConnection();
+        httpURLConnection.setRequestMethod("GET");
+        httpURLConnection.setConnectTimeout(3000);
+        httpURLConnection.connect();
+        StringBuilder responseSB = null;
+        BufferedReader br = null;
+        responseSB = new StringBuilder();
+        br = new BufferedReader(
+                new InputStreamReader(httpURLConnection.getInputStream()));
+        String line;
+        while ((line = br.readLine()) != null)
+            responseSB.append(line);
+        br.close();
+        return responseSB.toString();
+    }
+
+    public AuthorizationCodeAndState getAuthorizationCodeAndState()
+            throws IOException {
+        String newRedirectUri = redirectURI.substring(0,
+                redirectURI.lastIndexOf("/"));
+        String codeStateUri = newRedirectUri + "/getcode";
+        String response = getAuthCodeAndState(codeStateUri);
+        boolean connect = true;
+        while (!(response.contains("code"))) {
+            response = getAuthCodeAndState(codeStateUri);
+            if (connect) {
+                System.out.println("connecting.....");
+                connect = false;
+            }
+        }
+        // webserver is going to stop after retrieving code and state
+        if (!"remote".equalsIgnoreCase(webServer)) {
+            httpWebServer.stopServer(webServerPort);
+        }
+        String[] responses = response.split(":");
+        String code = responses[1];
+        String state = responses[3];
+
+        return new AuthorizationCodeAndState(code, state);
+    }
+
+    /**
+     * pops up the browser with CSP URI which contains client id,client
+     * secret,redirect uri.
+     * 
+     * @param server       vcenter host name.
+     * @param clientid     client id of registered web server.
+     * @param redirect_uri of the web server.
+     */
+    public void openbrowser(String server, String clientID) throws Exception {
+        String[] strings = redirectURI.split(":");
+        // getting the port number from redirecr uri argument to bring up local
+        // web server
+        webServerPort = Integer.parseInt(strings[2].split("/")[0]);
+        if (!"remote".equalsIgnoreCase(webServer)) {
+            httpWebServer = new SimpleHttpWebServer();
+            httpWebServer.startWebServer(webServerPort);
+        }
+        String authUri = identityType.getAuthorizationURLString();
+        authUri += "client_id=" + clientID + "&redirect_uri="
+                + redirectURI.toString();
+        String url = authUri.trim();
+        // Replacing spaces contained in the url to %20
+        if (url.contains(" "))
+            url = url.replace(" ", "%20");
+        if (Desktop.isDesktopSupported()
+                && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+            Desktop.getDesktop().browse(new URI(url));
+        }
+        return;
+    }
+}
diff --git a/src/main/java/vmware/samples/common/authentication/Constants.java b/src/main/java/vmware/samples/common/authentication/Constants.java
new file mode 100644
index 00000000000..928c6cccfbc
--- /dev/null
+++ b/src/main/java/vmware/samples/common/authentication/Constants.java
@@ -0,0 +1,17 @@
+package vmware.samples.common.authentication;
+
+public class Constants {
+
+    public static final String ID_TOKEN="id_token";
+    public static final String ACCESS_TOKEN="access_token";
+    public static final String CLIENT_ID="client_id";
+    public static final String CLIENT_SECRET="client_secret";
+    public static final String GRANT_TYPE="grant_type";
+    public static final String CODE="code";
+    public static final String STATE="state";
+    public static final String REDIRECT_URI="redirect_uri";
+    public static final String REFRESH_TOKEN="refresh_token";
+    public static final String ORG_ID="orgId";
+    public static final String USERNAME="username";
+    public static final String PASSWORD="password";
+}
diff --git a/src/main/java/vmware/samples/common/authentication/SimpleHttpWebServer.java b/src/main/java/vmware/samples/common/authentication/SimpleHttpWebServer.java
new file mode 100644
index 00000000000..210abcc209e
--- /dev/null
+++ b/src/main/java/vmware/samples/common/authentication/SimpleHttpWebServer.java
@@ -0,0 +1,151 @@
+package vmware.samples.common.authentication;
+
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+IMPORTANT: To be used only in Test Environment NOT for any production.
+ Program to setup a simple http webserver for oAuth  Authorization Code Grant Type Workflow.
+Web Server would be running in https://<local_ipaddress>:<portnumber>/authcode
+
+We define listeners for two endpoints,
+1. /getcode -> The client code hits this endpoint to fetch the 'code' and 'state' variable
+                It is a GET request
+                Once the response is returned, the variables need to be reassigned with ''
+                or None, to avoid inconsistent values
+
+2. /authcode -> This is the redirect endpoint which will be called by the CSP server
+                It is a GET request
+                code and state are the request params
+                e.g., /authcode?code=xxxx&state=xxxxx
+In case, you want to change the names of these endpoints in your client,
+make sure to change in the below server code as well
+**/
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+
+@SuppressWarnings("restriction")
+public class SimpleHttpWebServer  {
+
+    private static int PORT;
+    private static String code = "";
+    private static String state = "";
+    private static HttpServer server;
+    private final static String AUTHPATH = "/authcode";
+    private final static String GETPATH = "/getcode";
+
+     /**
+     * This method send response code and state value back to the client.
+     *
+     * @param httpExchange {@link HttpExchange}
+     * @param response
+     */
+	protected void writeResponse(HttpExchange httpExchange, String response) throws IOException {
+        httpExchange.sendResponseHeaders(200, response.length());
+        OutputStream os = httpExchange.getResponseBody();
+        os.write(response.getBytes());
+        os.close();
+    }
+
+     /**
+     * This method returns url parameters in a map
+     *
+     * @param query from the uri
+     * @return code and state and its respective values
+     */
+    protected Map<String, String> queryToMap(String query) {
+        Map<String, String> result = new HashMap<String, String>();
+        for (String param : query.split("&")) {
+            String pair[] = param.split("=");
+            if (pair.length > 1) {
+                result.put(pair[0], pair[1]);
+            } else {
+                result.put(pair[0], "");
+            }
+        }
+        return result;
+    }
+
+     /**
+      * A handler which is invoked to process HTTP exchanges.
+      *
+      * @params httpExchange encapsulates a HTTP request received
+      * and a response generated is code and state
+      */
+	protected class GetHandler implements HttpHandler {
+        public void handle(HttpExchange httpExchange) throws IOException {
+            SimpleHttpWebServer  simpleHttpServer = new SimpleHttpWebServer();
+            String response = null;
+            if(!"".equals(code) && !"".equals(state)) {
+                response = "code:" + code + ":state:" + state;
+            }
+            else {
+                response="variables are not set";
+            }
+            simpleHttpServer.writeResponse(httpExchange, response.toString());
+            code="";
+            state="";
+
+        }
+
+    }
+     /**
+      * Fetches the keys-values from the uri and initialize to code and state class variable.
+      *
+      * @params httpExchange encapsulates a HTTP request received
+      * and on successful execution display redirect_uri
+      */
+    protected class AuthHandler implements HttpHandler {
+        SimpleHttpWebServer  httpServer;
+
+        public void handle(HttpExchange httpExchange) throws IOException {
+            httpServer = new SimpleHttpWebServer();
+            Map<String, String> params = httpServer.queryToMap(httpExchange.getRequestURI().getQuery());
+            code = params.get("code");
+            state = params.get("state");
+            String response = "Found Authorization code and state variables , you can close the window";
+            httpServer.writeResponse(httpExchange, response.toString());
+
+        }
+
+    }
+
+    public void startWebServer(int port) {
+        PORT=port;
+        try {
+            server = HttpServer.create(new InetSocketAddress(PORT), 0);
+            server.createContext(AUTHPATH, new SimpleHttpWebServer().new AuthHandler());
+            server.createContext(GETPATH, new SimpleHttpWebServer(). new GetHandler());
+            server.setExecutor(null); // creates a default executor
+            server.start();
+        } 
+        catch (IOException e) {
+            System.out.println(e.getMessage());
+            System.exit(0);
+        }
+    }
+    
+    public void stopServer(int port) {
+        server.stop(0);
+    }
+
+}
+
diff --git a/src/main/java/vmware/samples/common/authentication/SslUtil.java b/src/main/java/vmware/samples/common/authentication/SslUtil.java
new file mode 100644
index 00000000000..531f9fb7987
--- /dev/null
+++ b/src/main/java/vmware/samples/common/authentication/SslUtil.java
@@ -0,0 +1,200 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+package vmware.samples.common.authentication;
+
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+/**
+ * Retrieves the SSL certificate chain of an HTTPS server and stores the root
+ * certificate into an in-memory trust store.
+ * <p>
+ * Note: Circumventing SSL trust is unsafe and should not use these in
+ * production software.
+ * </p>
+ */
+public class SslUtil {
+
+    public static KeyStore createTrustStoreForServer(String url) {
+        URI uri;
+        try {
+            uri = new URI(url);
+        } catch (URISyntaxException ex) {
+            throw new IllegalArgumentException(ex);
+        }
+        String host = uri.getHost();
+        int port = uri.getPort();
+        if (port == -1) {
+            port = 443;
+        }
+        return createTrustStoreForServer(host, port);
+    }
+
+    public static KeyStore createTrustStoreForServer(String host, int port) {
+        TrustManager trustAll = new X509TrustManager() {
+            @Override
+            public void checkServerTrusted(X509Certificate[] chain,
+                                           String authType)
+                                                   throws CertificateException {
+                // accept all
+            }
+
+            @Override
+            public void checkClientTrusted(X509Certificate[] chain,
+                                           String authType)
+                                                   throws CertificateException {
+                // server-side only; irrelevant for clients
+            }
+
+            @Override
+            public X509Certificate[] getAcceptedIssuers() {
+                // server-side only; irrelevant for clients
+                return null;
+            }
+        };
+
+        try {
+            SSLContext ctx = SSLContext.getInstance("TLS");
+            ctx.init(null, new TrustManager[] { trustAll }, null);
+            SSLSocket s =
+                    (SSLSocket) ctx.getSocketFactory().createSocket(host, port);
+            Certificate[] chain = s.getSession().getPeerCertificates();
+
+            // last one is the root certificate
+            Certificate rootCert = chain[chain.length - 1];
+            KeyStore trustStore =
+                    KeyStore.getInstance(KeyStore.getDefaultType());
+            trustStore.load(null, null);
+            trustStore.setCertificateEntry(host, rootCert);
+
+            return trustStore;
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    /**
+     * Method to trust all the HTTPS certificates. To be used only in the
+     * development environment for convenience.
+     */
+    public static void trustAllHttpsCertificates() {
+        try {
+            // Create the trust manager.
+            TrustManager[] trustAllCerts =
+                    new TrustManager[1];
+            TrustManager tm = new TrustAllTrustManager();
+            trustAllCerts[0] = tm;
+
+            // Create the SSL context
+            SSLContext sc =
+                    SSLContext.getInstance("SSL");
+
+            // Create the session context
+            javax.net.ssl.SSLSessionContext sslsc =
+                    sc.getServerSessionContext();
+            /*
+             * Initialize the contexts; the session context takes the trust
+             * manager.
+             */
+            sslsc.setSessionTimeout(0);
+            sc.init(null, trustAllCerts, null);
+
+            /*
+             * Use the default socket factory to create the socket for the
+             * secure connection
+             */
+            HttpsURLConnection
+                    .setDefaultSSLSocketFactory(sc.getSocketFactory());
+
+            /*
+             * Declare a host name verifier that will automatically enable the
+             * connection. The host name verifier is invoked during the SSL
+             * handshake.
+             */
+            HostnameVerifier hv = new HostnameVerifier() {
+                public boolean verify(String urlHostName, SSLSession session) {
+                    return true;
+                }
+            };
+
+            // Set the default host name verifier to enable the connection.
+            HttpsURLConnection.setDefaultHostnameVerifier(hv);
+
+        } catch (KeyManagementException e) {
+            throw new RuntimeException(e);
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        } catch (IllegalArgumentException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Load the certificate from file.
+     *
+     * @param filePath
+     * @return {@link X509Certificate}
+     * @throws IOException
+     * @throws CertificateException
+     */
+    public static X509Certificate loadCertificate(String filePath)
+            throws IOException, CertificateException {
+        ByteArrayInputStream bis = new ByteArrayInputStream(Files
+                .readAllBytes(Paths.get(filePath)));
+        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+        return (X509Certificate) cf.generateCertificate(bis);
+    }
+
+    /**
+     * Loads the truststore containing the trusted server certificates.
+     *
+     * @param filePath path to the truststore file
+     * @param password password for the truststore.
+     * @return an instance of KeyStore object containing the trusted server
+     *         certificates
+     * @throws Exception
+     */
+    public static KeyStore loadTrustStore(String filePath, String password)
+            throws Exception {
+        KeyStore trustStore = KeyStore.getInstance("JKS");
+        InputStream truststoreStream = new FileInputStream(filePath);
+        try {
+            trustStore.load(truststoreStream, password.toCharArray());
+            return trustStore;
+        } finally {
+            truststoreStream.close();
+        }
+    }
+}
diff --git a/src/main/java/vmware/samples/common/authentication/TrustAllTrustManager.java b/src/main/java/vmware/samples/common/authentication/TrustAllTrustManager.java
new file mode 100644
index 00000000000..60268440e75
--- /dev/null
+++ b/src/main/java/vmware/samples/common/authentication/TrustAllTrustManager.java
@@ -0,0 +1,73 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+package vmware.samples.common.authentication;
+
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * This class breaks the Java SSL Trust Management services so that Java will
+ * trust any and all SSL certificates. You probably don't ever want to use this
+ * in a production environment but we are using it here to help you to test your
+ * code against systems that may not have a real SSL certificate.
+ * <p>
+ * <strong>It is not advised to ever use this in production.</strong>
+ */
+public final class TrustAllTrustManager
+        implements javax.net.ssl.TrustManager, javax.net.ssl.X509TrustManager {
+
+    public TrustAllTrustManager() {
+    }
+
+    public void register()
+            throws NoSuchAlgorithmException, KeyManagementException {
+        register(this);
+    }
+
+    public static void register(javax.net.ssl.TrustManager tm)
+            throws NoSuchAlgorithmException, KeyManagementException {
+        javax.net.ssl.TrustManager[] trustAllCerts =
+                new javax.net.ssl.TrustManager[1];
+        trustAllCerts[0] = tm;
+        javax.net.ssl.SSLContext sc =
+                javax.net.ssl.SSLContext.getInstance("SSL");
+        javax.net.ssl.SSLSessionContext sslsc = sc.getServerSessionContext();
+        sslsc.setSessionTimeout(0);
+        sc.init(null, trustAllCerts, null);
+        javax.net.ssl.HttpsURLConnection
+                .setDefaultSSLSocketFactory(sc.getSocketFactory());
+    }
+
+    @Override
+    public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+        return null;
+    }
+
+    @Override
+    public void
+           checkServerTrusted(java.security.cert.X509Certificate[] certs,
+                              String authType)
+                                throws java.security.cert.CertificateException {
+        return;
+    }
+
+    @Override
+    public void
+           checkClientTrusted(java.security.cert.X509Certificate[] certs,
+                              String authType)
+                                throws java.security.cert.CertificateException {
+        return;
+    }
+
+}
diff --git a/src/main/java/vmware/samples/common/authentication/VapiAuthenticationHelper.java b/src/main/java/vmware/samples/common/authentication/VapiAuthenticationHelper.java
index d7665ec4418..9aa331dc788 100644
--- a/src/main/java/vmware/samples/common/authentication/VapiAuthenticationHelper.java
+++ b/src/main/java/vmware/samples/common/authentication/VapiAuthenticationHelper.java
@@ -21,6 +21,7 @@
 import com.vmware.vapi.core.ExecutionContext.SecurityContext;
 import com.vmware.vapi.protocol.HttpConfiguration;
 import com.vmware.vapi.protocol.ProtocolConnection;
+import com.vmware.vapi.protocol.HttpConfiguration.SslConfiguration;
 import com.vmware.vapi.saml.SamlToken;
 import com.vmware.vapi.security.SessionSecurityContext;
 
@@ -161,7 +162,7 @@ public void logout() {
      *
      * @return factory for the client side stubs
      */
-    private StubFactory createApiStubFactory(String server,
+    public StubFactory createApiStubFactory(String server,
         HttpConfiguration httpConfig)
             throws Exception {
         // Create a https connection with the vapi url
@@ -178,6 +179,27 @@ private StubFactory createApiStubFactory(String server,
         return stubFactory;
     }
 
+    /**
+     * 
+     * @param server
+     * @param httpConfig
+     * @throws Exception
+     */
+    public void createStubFactory(String server, HttpConfiguration httpConfig) throws Exception {
+        this.stubFactory = createApiStubFactory(server, httpConfig);
+
+    }
+    
+    /**
+     * 
+     * @param server
+     * @param skipServerVerification
+     * @throws Exception
+     */
+    public void createStubFactory(String server, boolean skipServerVerification) throws Exception {
+        this.stubFactory = createApiStubFactory(server, buildHttpConfiguration(skipServerVerification));
+
+    }
     /**
      * Returns the stub factory for the api endpoint
      *
@@ -186,4 +208,53 @@ private StubFactory createApiStubFactory(String server,
     public StubFactory getStubFactory() {
         return this.stubFactory;
     }
+    
+	/**
+	 * Builds the http configuration.
+	 * 
+	 * @return the http configuration
+	 * @throws Exception the exception
+	 */
+	public HttpConfiguration buildHttpConfiguration(boolean skipServerVerification) throws Exception {
+      HttpConfiguration httpConfig =
+          new HttpConfiguration.Builder()
+          .setSslConfiguration(buildSslConfiguration(skipServerVerification))
+          .getConfig();        
+      return httpConfig;
+  }
+
+  /**
+   * Builds the ssl configuration.
+   *
+   * @return the ssl configuration
+   * @throws Exception the exception
+   */
+  private SslConfiguration buildSslConfiguration(boolean skipServerVerification) throws Exception {
+	  SslConfiguration sslConfig;
+	  //if(skipServerVerification) {
+          SslUtil.trustAllHttpsCertificates();
+          sslConfig = new SslConfiguration.Builder()
+      		.disableCertificateValidation()
+      		.disableHostnameVerification()
+      		.getConfig();
+	  //}else {
+            /*
+             * Set the system property "javax.net.ssl.trustStore" to
+             * the truststorePath
+             
+            System.setProperty("javax.net.ssl.trustStore", this.truststorePath);
+            KeyStore trustStore =
+                SslUtil.loadTrustStore(this.truststorePath,
+                		this.truststorePassword);
+            KeyStoreConfig keyStoreConfig =
+            		new KeyStoreConfig("", this.truststorePassword);
+            sslConfig =
+            		new SslConfiguration.Builder()
+            		.setKeyStore(trustStore)
+            		.setKeyStoreConfig(keyStoreConfig)
+            		.getConfig();*/
+        //}
+
+      return sslConfig;
+  }
 }
diff --git a/src/main/java/vmware/samples/common/authentication/VimAuthenticationHelper.java b/src/main/java/vmware/samples/common/authentication/VimAuthenticationHelper.java
index 5a7aa9d9c80..1697eff14ce 100644
--- a/src/main/java/vmware/samples/common/authentication/VimAuthenticationHelper.java
+++ b/src/main/java/vmware/samples/common/authentication/VimAuthenticationHelper.java
@@ -16,7 +16,10 @@
 
 import javax.xml.ws.BindingProvider;
 
+import com.vmware.vim25.InvalidLocaleFaultMsg;
+import com.vmware.vim25.InvalidLoginFaultMsg;
 import com.vmware.vim25.ManagedObjectReference;
+import com.vmware.vim25.RuntimeFaultFaultMsg;
 import com.vmware.vim25.ServiceContent;
 import com.vmware.vim25.VimPortType;
 import com.vmware.vim25.VimService;
@@ -89,7 +92,7 @@ public void loginByUsernameAndPassword(
             this.vimPort.login(
                 serviceContent.getSessionManager(), username, password, null);
 
-        } catch (Exception e) {
+        } catch (InvalidLocaleFaultMsg | InvalidLoginFaultMsg | RuntimeFaultFaultMsg e) {
             e.printStackTrace();
         }
     }
diff --git a/src/main/java/vmware/samples/common/authentication/VmcAuthenticationHelper.java b/src/main/java/vmware/samples/common/authentication/VmcAuthenticationHelper.java
index c8d706cafb9..e9202625c9e 100644
--- a/src/main/java/vmware/samples/common/authentication/VmcAuthenticationHelper.java
+++ b/src/main/java/vmware/samples/common/authentication/VmcAuthenticationHelper.java
@@ -41,4 +41,26 @@ public ApiClient newVmcClient(String vmcServer, String cspServer,
                 .setRefreshToken(refreshToken.toCharArray())
                 .build();
     }
+
+    /**
+     * Instantiates an NSX ApiClient using a refresh token which can be used
+     * for creating stubs.
+     *
+     * @param vmcServer hostname/ip address of the vmc server
+     * @param cspServer hostname/ipaddress of the csp server
+     * @param refreshToken refresh token of the user
+     * @param orgId organization ID
+     * @param sddcId SDDC ID
+     * @return An ApiClient that can be used to submit API requests
+     */
+    public ApiClient newNsxClient(String vmcServer, String cspServer,
+            String refreshToken, String orgId, String sddcId) {
+        String cspUrl = "https://" + cspServer + CSP_AUTHORIZATION_URL;
+        String vmcUrl = "https://" + vmcServer + "/vmc/api/orgs/" + orgId + "/sddcs/" + sddcId + "/networks";
+        return VmcClients.custom()
+                .setBaseUrl(vmcUrl)
+                .setAuthorizationUrl(cspUrl)
+                .setRefreshToken(refreshToken.toCharArray())
+                .build();
+    }
 }
diff --git a/src/main/java/vmware/samples/fedramp/FedrampAuthenticationFlow.java b/src/main/java/vmware/samples/fedramp/FedrampAuthenticationFlow.java
new file mode 100644
index 00000000000..f20753c4b1c
--- /dev/null
+++ b/src/main/java/vmware/samples/fedramp/FedrampAuthenticationFlow.java
@@ -0,0 +1,281 @@
+package vmware.samples.fedramp;
+
+import java.security.KeyStore;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.configuration.ConfigurationException;
+
+import com.vmware.cis.tagging.Tag;
+import com.vmware.vapi.bindings.StubConfiguration;
+import com.vmware.vapi.protocol.HttpConfiguration;
+import com.vmware.vapi.protocol.HttpConfiguration.KeyStoreConfig;
+import com.vmware.vapi.protocol.HttpConfiguration.SslConfiguration;
+import com.vmware.vapi.saml.SamlToken;
+
+import vmware.samples.common.ParametersHelper;
+import vmware.samples.common.SslUtil;
+import vmware.samples.common.authentication.VapiAuthenticationHelper;
+
+public class FedrampAuthenticationFlow {
+    private Tag taggingService;
+    private String vCenterServer;
+    private String refreshToken;
+    private String cspServer;
+    protected String vcenterTruststorePath;
+    protected String vcenterTruststorePassword;    
+    private VapiAuthenticationHelper vapiAuthHelper;
+    private Map<String, Object> parsedOptions;
+	private Boolean skipServerVerification;
+
+    /**
+     * Define the options specific to this sample and configure the sample using
+     * command-line arguments or a config file
+     *
+     * @param args command line arguments passed to the sample
+     */
+    public void parseArgs(String[] args) {
+    	try {
+	    	ParametersHelper paramsHelper = null;
+            Option serverOption = Option.builder()
+                    .required(true)
+                    .hasArg()
+                    .argName("vCENTER SERVER")
+                    .longOpt("vCenterServer")
+                    .desc("hostname or IP address of vCenter Server")
+                    .build();
+
+	        Option refreshToken = Option.builder()
+	                .longOpt("refreshToken")
+	                .desc("VMC refresh token")
+	                .argName("VMC refresh token")
+	                .required(true)
+	                .hasArg()
+	                .build();
+	        
+	        Option cspServer = Option.builder()
+	                .longOpt("cspServer")
+	                .desc("hostname or IP address of CSP Server")
+	                .argName("CSP SERVER")
+	                .required(true)
+	                .hasArg()
+	                .build();
+            
+	        Option skipServerVerificationOption = Option.builder()
+                    .required(false)
+                    .longOpt("skip-server-verification")
+                    .type(Boolean.class)
+                    .desc("OPTIONAL: Specify this option if you do not "
+                            + "want to perform SSL certificate "
+                            + "verification.\nNOTE: Circumventing SSL "
+                            + "trust in this manner is unsafe and should "
+                            + "not be used with production code. "
+                            + "This is ONLY FOR THE PURPOSE OF "
+                            + "DEVELOPMENT ENVIRONMENT.")
+                    .build();
+            Option truststorePathOption = Option.builder()
+                    .required(false)
+                    .hasArg()
+                    .argName("ABSOLUTE PATH OF JAVA TRUSTSTORE FILE")
+                    .longOpt("vcenterTruststorePath")
+                    .desc("Specify the absolute path to the file "
+                         + "containing the trusted server certificates. "
+                         + "This option can be skipped if the parameter "
+                         + "skip-server-verification is specified.")
+                    .build();
+
+            Option truststorePasswordOption = Option.builder()
+                    .required(false)
+                    .hasArg()
+                    .argName("JAVA TRUSTSTORE PASSWORD")
+                    .longOpt("vCenterTruststorePassword")
+                    .desc("Specify the password for the java "
+                         + "truststore. This option can be skipped if "
+                         + "the parameter skip-server-verification is "
+                         + "specified.")
+                    .build();
+
+	        List<Option> optionList = Arrays.asList(serverOption, refreshToken,
+	        		cspServer, truststorePathOption, truststorePasswordOption,
+	        		skipServerVerificationOption);
+	        paramsHelper = new ParametersHelper(optionList);
+
+	        this.parsedOptions = paramsHelper.parse(args,
+	                this.getClass().getName());        
+	        this.vCenterServer = (String) parsedOptions.get("vCenterServer");
+	        this.cspServer = (String) parsedOptions.get("cspServer");
+	        this.refreshToken = (String) parsedOptions.get("refreshToken");
+            Object skipServerVerificationObj =
+                    parsedOptions.get("skip-server-verification");
+            if(skipServerVerificationObj != null) {
+                this.skipServerVerification =
+                        (Boolean) skipServerVerificationObj;
+            } else {
+                this.skipServerVerification = false;
+            }
+
+            Object truststorePathObj = parsedOptions.get("truststorepath");
+            if(truststorePathObj != null) {
+                this.vcenterTruststorePath =
+                        (String) parsedOptions.get("truststorepath");
+            }
+
+            Object truststorePasswordObj =
+                    parsedOptions.get("truststorepassword");
+            if(truststorePasswordObj != null) {
+                this.vcenterTruststorePassword =
+                        (String) parsedOptions.get("truststorepassword");
+            }
+
+            // Check if truststorePath and truststorePassword are specified
+            if(!this.skipServerVerification && (
+                    this.vcenterTruststorePath == null ||
+                    this.vcenterTruststorePassword == null)) {
+                throw new ConfigurationException(
+                    "The parameters truststorepath and truststorepassword "
+                    + "need to be specified for server certificate "
+                    + " verification. These are required"
+                    + " parameters if the parameter skip-server-verification "
+                    + "has not been specified.");
+            }	        
+    	} catch (ParseException pex) {
+            System.out.println(pex.getMessage());
+            System.exit(0);
+        } catch (ConfigurationException cex) {
+            System.out.println(cex.getMessage());
+            System.exit(0);
+        } 
+    }
+
+    public void run() throws Exception {
+
+        System.out.println("\n\n#### Example: Login to vCenter server with "
+                           + "embedded Platform Services Controller");
+
+        this.vapiAuthHelper = new VapiAuthenticationHelper();
+
+        HttpConfiguration httpConfig = buildHttpConfiguration();
+
+        System.out.println("\nStep 1: Retrieve the SAML bearer token.");
+        SamlToken samlBearerToken = SamlTokenUtil.getSamlBearerToken(this.vCenterServer,
+        		this.cspServer, this.refreshToken);        
+
+        System.out.println("\nStep 2. Login to vAPI services using the "
+                           + "SAML bearer token.");
+        StubConfiguration sessionStubConfig =
+                this.vapiAuthHelper.loginBySamlBearerToken(this.vCenterServer, samlBearerToken, httpConfig);
+
+        System.out.println("\nStep 3: Perform certain tasks using the vAPI "
+                           + "services.");
+        this.taggingService = this.vapiAuthHelper.getStubFactory()
+            .createStub(Tag.class, sessionStubConfig);
+        System.out.println("\nListing all tags on the vcenter server..");
+        List<String> tagList = this.taggingService.list();
+        if(tagList.isEmpty()) {
+            System.out.println("\nNo tags found !");
+        } else {
+            System.out.println("\nTag Name\tTag Description");
+            for(String tagId : tagList) {
+                System.out.println(this.taggingService.get(tagId).getName()
+                        + "\t" + this.taggingService.get(tagId).getDescription());
+            }
+        }
+        vapiAuthHelper.logout();
+    }
+
+    /**
+     * Builds the Http settings to be applied for the connection to the server.
+     * @return http configuration
+     * @throws Exception 
+     */
+    protected HttpConfiguration buildHttpConfiguration() throws Exception {
+        HttpConfiguration httpConfig =
+            new HttpConfiguration.Builder()
+            .setSslConfiguration(buildSslConfiguration())
+            .getConfig();
+        
+        return httpConfig;
+	}
+    
+	/**
+     * Builds the SSL configuration to be applied for the connection to the
+     * server
+     * 
+     * If "skip-server-verification" is specified, then the server certificate
+     * verification is skipped. The method retrieves the certificate
+     * from specified server and adds it to an in-memory trustStore which is
+     * returned.
+     * If "skip-server-verification" is not specified, then it uses the
+     * truststorepath and truststorepassword to load the truststore and return
+     * it.
+     *<p><b>
+     * Note: Below code circumvents SSL trust if "skip-server-verification" is
+     * specified. Circumventing SSL trust is unsafe and should not be used
+     * in production software. It is ONLY FOR THE PURPOSE OF DEVELOPMENT
+     * ENVIRONMENTS.
+     *<b></p>
+     * @return SSL configuration
+     * @throws Exception
+     */
+    protected SslConfiguration buildSslConfiguration() throws Exception {
+        SslConfiguration sslConfig;
+
+        if(this.skipServerVerification) {
+            /*
+             * Below method enables all VIM API connections to the server
+             * without validating the server certificates.
+             *
+             * Note: Below code is to be used ONLY IN DEVELOPMENT ENVIRONMENTS.
+             * Circumventing SSL trust is unsafe and should not be used in
+             * production software.
+             */
+            SslUtil.trustAllHttpsCertificates();
+
+            /*
+             * Below code enables all vAPI connections to the server
+             * without validating the server certificates..
+             *
+             * Note: Below code is to be used ONLY IN DEVELOPMENT ENVIRONMENTS.
+             * Circumventing SSL trust is unsafe and should not be used in
+             * production software.
+             */
+            sslConfig = new SslConfiguration.Builder()
+            		.disableCertificateValidation()
+            		.disableHostnameVerification()
+            		.getConfig();
+        } else {
+            /*
+             * Set the system property "javax.net.ssl.trustStore" to
+             * the truststorePath
+             */
+            System.setProperty("javax.net.ssl.trustStore", this.vcenterTruststorePath);
+            KeyStore trustStore =
+                SslUtil.loadTrustStore(this.vcenterTruststorePath,
+                		this.vcenterTruststorePassword);
+            KeyStoreConfig keyStoreConfig =
+            		new KeyStoreConfig("", this.vcenterTruststorePassword);
+            sslConfig =
+            		new SslConfiguration.Builder()
+            		.setKeyStore(trustStore)
+            		.setKeyStoreConfig(keyStoreConfig)
+            		.getConfig();
+        }
+
+        return sslConfig;
+    }
+
+    public static void main(String[] args) throws Exception {
+    	FedrampAuthenticationFlow fedrampAuth = null;
+    	fedrampAuth = new FedrampAuthenticationFlow();
+
+        // Parse the command line arguments or the configuration file
+    	fedrampAuth.parseArgs(args);
+
+        // Execute the sample
+    	fedrampAuth.run();
+    }
+
+}
diff --git a/src/main/java/vmware/samples/fedramp/RestHandler.java b/src/main/java/vmware/samples/fedramp/RestHandler.java
new file mode 100644
index 00000000000..b4162ca4f44
--- /dev/null
+++ b/src/main/java/vmware/samples/fedramp/RestHandler.java
@@ -0,0 +1,97 @@
+/* **********************************************************
+ * Copyright 2018 VMware, Inc.  All rights reserved.
+ * **********************************************************/
+
+package vmware.samples.fedramp;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * class for the doing httpPost call
+ * this class uses native jdk provided libraries for a http REST Call, without using any third party libraries.
+ * @author vsphere-sdk Engineering
+ */
+public class RestHandler {
+  /**
+   * Method to do httpPost call which uses the following parameteres,this
+   * method acts like template method to do any type of http post call
+   *
+   * @param url URL for the http REST call
+   * @param headers Headers for the http call
+   * @param body Body of the http call
+   * @return
+   * @throws Exception
+   */
+  public static Map<Integer, String> httpPost(URL url, Map<String, String> headers, String body) throws Exception {
+
+    Map<Integer, String> responseMap = new HashMap<Integer, String>();
+    HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+    conn.setDoOutput(true);
+    conn.setRequestMethod("POST");
+    Iterator<Entry<String, String>> iterator = headers.entrySet().iterator();
+    while(iterator.hasNext()) {
+      Entry<String, String> pair = (Entry<String, String>)iterator.next();
+      conn.setRequestProperty(pair.getKey().toString(), pair.getValue().toString());
+      iterator.remove();
+    }
+
+    OutputStream os = conn.getOutputStream();
+    os.write(body.getBytes("UTF-8"));
+    os.flush();
+
+    int responseCode = conn.getResponseCode();
+    BufferedReader br = null;
+    StringBuilder responseSB = null;
+    try {
+       if(responseCode==HttpURLConnection.HTTP_OK) {
+                          StringBuilder textBuilder = new StringBuilder();
+                                if (conn.getErrorStream() != null) {
+                                          Reader reader = new BufferedReader(
+                  new InputStreamReader(conn.getErrorStream(), Charset.forName(StandardCharsets.UTF_8.name())));
+                                         int c = 0;
+              while ((c = reader.read()) != -1) {
+                textBuilder.append((char) c);
+              }
+            }
+            // Read response
+            responseSB = new StringBuilder();
+            br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            String line;
+            while ((line = br.readLine()) != null)
+               responseSB.append(line);
+            }
+       else {
+         throw new Exception("Failed : HTTP error code : " + responseCode);
+       }
+    }
+       catch(Exception e){
+      System.err.println("Failed : HTTP error code : " + responseCode);
+      responseMap.put(responseCode, "Failed : HTTP error code : ");
+      throw new Exception("Failed : HTTP error code : " + responseCode);
+       }
+    finally {
+      if(br!=null) {
+        br.close();
+      }
+      if(os!=null) {
+        os.close();
+      }
+    }
+    // Close streams
+    responseMap.put(responseCode, responseSB.toString());
+    return responseMap;
+
+  }
+
+}
diff --git a/src/main/java/vmware/samples/fedramp/SamlTokenUtil.java b/src/main/java/vmware/samples/fedramp/SamlTokenUtil.java
new file mode 100644
index 00000000000..fb34ab23919
--- /dev/null
+++ b/src/main/java/vmware/samples/fedramp/SamlTokenUtil.java
@@ -0,0 +1,142 @@
+package vmware.samples.fedramp;
+
+import java.io.StringReader;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import javax.xml.bind.DatatypeConverter;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+
+import com.vmware.vapi.saml.DefaultTokenFactory;
+import com.vmware.vapi.saml.SamlToken;
+
+public class SamlTokenUtil {
+
+	private static final String CSP_ENDPOINT = "/csp/gateway/am/api/auth/api-tokens/authorize";
+	private static final String VCENTER_TOKENEXCHANGE_ENDPOINT = "/rest/vcenter/tokenservice/token-exchange";
+	
+    /***
+     * Method to to get access token by using refresh token from the CSP server
+     *
+     * @param refreshToken refresh Token of the authorized VMware Cloud User
+     * @param cspServer VMware Cloud URL (eg:https://console.cloud.vmware.com)
+     * @return
+     * @throws Exception
+     */
+	public static Map<String, String> getAccessTokenByApiRefreshToken(String cspServer, String refreshToken)
+			throws Exception {
+		// Form the REST URL
+		String cspURL = "https://" + cspServer + CSP_ENDPOINT;
+		URL url = new URL(cspURL);
+
+		// Form the REST Header
+		Map<String, String> headers = new HashMap<String, String>();
+		headers.put("Content-Type", "application/x-www-form-urlencoded");
+		headers.put("Accept", "application/json");
+		String body = "refresh_token=" + refreshToken;
+		URLEncoder.encode(body, "UTF-8");
+
+		// POST the REST CALL and get the API Response
+		Map<Integer, String> apiResponse = RestHandler.httpPost(url, headers, body);
+		Iterator<Integer> iter = apiResponse.keySet().iterator();
+		Integer key = iter.next();
+		String local_response = apiResponse.get(key).replaceFirst("\\{", "").replace("\\}", "");
+		StringTokenizer tokenizer = new StringTokenizer(local_response, ",");
+		Map<String, String> map = new HashMap<>();
+		while (tokenizer.hasMoreElements()) {
+			String element = (String) tokenizer.nextElement();
+			String[] res = element.split(":");
+			String jsonkey = res[0].replaceAll("\"", "");
+			String value = res[1].replaceAll("\"", "");
+			if ("access_token".equalsIgnoreCase(jsonkey)) {
+				map.put(jsonkey, value);
+			}
+
+			if ("id_token".equalsIgnoreCase(jsonkey)) {
+				map.put(jsonkey, value);
+			}
+		}
+		return map;
+	}
+	
+	/**
+	 * Method to to get SAML Bearer token from the vCenter Server by using the access token
+	 * retrieved from CSP. 
+	 * 
+	 * @param accessToken Access Token
+	 * @param idToken ID Token
+	 * @param vCenterServer vCenter host name or IP address
+	 * @return
+	 */
+	public static Element getSamlTokenByApiAccessToken(String vCenterServer, String accessToken, String idToken)
+			throws Exception {
+		// Create the REST URL
+		String vcHostnameUri = "https://" + vCenterServer + VCENTER_TOKENEXCHANGE_ENDPOINT;
+		URL url = new URL(vcHostnameUri);
+
+		// Create the REST Header
+		Map<String, String> headers = new HashMap<String, String>();
+		headers.put("Content-Type", "application/json");
+		headers.put("Accept", "application/json");
+
+		headers.put("Authorization", "Bearer " + accessToken);
+
+		// POST the REST CALL and get the API Response
+		String payload = "{ \"spec\": { \"subject_token\":\"" + accessToken + "\","
+				+ "\"subject_token_type\":\"urn:ietf:params:oauth:token-type:access_token\", \""
+				+ "requested_token_type\": \"urn:ietf:params:oauth:token-type:saml2\","
+				+ "\"grant_type\": \"urn:ietf:params:oauth:grant-type:token-exchange\","
+				+ "\"actor_token_type\":\"urn:ietf:params:oauth:token-type:id_token\","
+				+ "\"actor_token\":\"" + idToken + "\"} }";
+
+		URLEncoder.encode(payload, "UTF-8");
+
+		Map<Integer, String> apiResponse = RestHandler.httpPost(url, headers, payload);
+		Iterator<Integer> itr = apiResponse.keySet().iterator();
+		Integer key = itr.next();
+		String local_response = apiResponse.get(key).replaceFirst("\\{", "").replace("\\}", "");
+		StringTokenizer tokenizer = new StringTokenizer(local_response, ",");
+		while (tokenizer.hasMoreElements()) {
+			String element = (String) tokenizer.nextElement();
+			String[] res = element.split(":");
+			String accessTokenElements = res[1].replaceFirst("\\{", "").replace("\\}", "");
+			String replacedAcessToken = accessTokenElements.toString().replaceAll("\"", "");
+			if ("access_token".equalsIgnoreCase(replacedAcessToken)) {
+				String samlToken = res[2];
+				String replacedSamlToken = samlToken.replaceAll("\"", "");
+				byte[] decodedBytes = DatatypeConverter.parseBase64Binary(replacedSamlToken);
+				String decodedSamlToken = new String(decodedBytes, "UTF-8");
+				DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+				factory.setNamespaceAware(true);
+				DocumentBuilder builder;
+				builder = factory.newDocumentBuilder();
+				Document doc = builder.parse(new InputSource(new StringReader(decodedSamlToken)));
+				return doc.getDocumentElement();
+			}
+		}
+		
+		throw new Exception("Error encountered while retrieving saml bearer token using access token");
+	}
+
+	public static SamlToken getSamlBearerToken(String vCenterServer, String cspServer,
+			String refreshToken) throws Exception {
+		// Get the access token and id token using refresh token
+        Map<String, String> tokenMap = getAccessTokenByApiRefreshToken( cspServer, refreshToken);
+        String accessToken = tokenMap.get("access_token");
+        String idToken = tokenMap.get("id_token");
+        
+        // Get the SAML Bearer token from the vcenter server endpoint using the access token and id token
+        Element bearerTokenElement =
+        		getSamlTokenByApiAccessToken(vCenterServer, accessToken, idToken);
+        return DefaultTokenFactory.createTokenFromDom(bearerTokenElement);
+	}
+}
diff --git a/src/main/java/vmware/samples/vcenter/identity/ListIdentityProviders.java b/src/main/java/vmware/samples/vcenter/identity/ListIdentityProviders.java
new file mode 100644
index 00000000000..7f83b06d23a
--- /dev/null
+++ b/src/main/java/vmware/samples/vcenter/identity/ListIdentityProviders.java
@@ -0,0 +1,90 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+package vmware.samples.vcenter.identity;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+
+import com.vmware.vcenter.identity.Providers;
+import com.vmware.vcenter.identity.ProvidersTypes.Summary;
+
+import vmware.samples.common.authentication.VapiAuthenticationHelper;
+
+/*
+ * Sample code to list the identity providers federated with the
+ * vCenter Server. The Identity providers list API doesn't require a
+ * an authenticated session. This will enable users to identify
+ * the federated IDPs and its various end points.
+ * (discovery end point, auth end point, token end point etc) 
+ */
+public class ListIdentityProviders  {
+    private Providers providersService;
+    private VapiAuthenticationHelper vAuthHelper = new VapiAuthenticationHelper();
+    protected Map<String, Object> parsedOptions;
+    protected String server;
+    protected boolean skipServerVerification = true;
+    protected void parseArgs(String args[]) {  
+        Options options = new Options();
+        Option serverOption = Option.builder()
+                .required(true)
+                .hasArg()
+                .argName("SERVER")
+                .longOpt("server")
+                .desc("hostname of vCenter Server")
+                .build();
+        options.addOption(serverOption);
+        CommandLineParser parser = new DefaultParser();
+        try {
+            CommandLine cmd = parser.parse(options, args);
+            this.server = cmd.getOptionValue("server");
+            } catch (ParseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    protected void setup() throws Exception {
+        this.vAuthHelper.createStubFactory(this.server, skipServerVerification);
+        this.providersService = 
+                this.vAuthHelper.getStubFactory().createStub(Providers.class);
+    }
+
+    protected void run(String args[]) throws Exception {
+        parseArgs(args);      
+        setup();
+        List<Summary> identityProviders= providersService.list();
+        if(identityProviders.isEmpty())
+        {
+            System.out.println("Identity Providers not Configured with this vCenter");
+        }
+        for (Summary summary : identityProviders) {
+            if (summary.getIsDefault())
+              System.out.println("Default Identity Provider Details \n"+summary);  
+            else
+                System.out.println("Non Default Identity Provider \n"+summary);
+        }
+
+    }
+    
+    public static void main(String[] args) throws Exception {
+        ListIdentityProviders list = new ListIdentityProviders();
+        list.run(args);        
+    }
+}
diff --git a/src/main/java/vmware/samples/vcenter/identity/granttypes/ListVMsAuthCodeGrant.java b/src/main/java/vmware/samples/vcenter/identity/granttypes/ListVMsAuthCodeGrant.java
new file mode 100644
index 00000000000..064bcfadbdd
--- /dev/null
+++ b/src/main/java/vmware/samples/vcenter/identity/granttypes/ListVMsAuthCodeGrant.java
@@ -0,0 +1,195 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+package vmware.samples.vcenter.identity.granttypes;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.configuration.ConfigurationException;
+
+import com.vmware.vapi.bindings.StubConfiguration;
+import com.vmware.vcenter.VM;
+import com.vmware.vcenter.VMTypes.FilterSpec.Builder;
+import com.vmware.vcenter.VMTypes.Summary;
+
+import vmware.samples.common.ParametersHelper;
+import vmware.samples.common.VcenterAuthorizationStubUtil;
+/**
+ * Description: Demonstrated Listing of VMs present in vCenter using auth code grant type for OIDC(Oauth2).
+ * Auth Code grant type: The Authorization Code grant type is used by confidential and public clients to
+ * exchange an authorization code for an access token.After the user returns to the client via the redirect URL,
+ * the application will get the authorization code from the URL and use it to request an access token.
+ * Author: VMware, Inc.
+ * Sample Prerequisites: vCenter 7.0
+ * Arguments:
+ * VcenterServer: vcneter server IP or Host name.
+ * redirect_uri: redirect uri where code and state variables has to be stored.
+ * clientId: client Id of Oauth registered app.
+ * clientSecret: Client Secret key of registered Oauth app.
+ * webServerType: which server type user needed local or remote.
+ */
+public class ListVMsAuthCodeGrant {
+    protected String vmFolderName;
+    protected String datacenterName;
+    protected String clusterName;
+    protected String server;
+    protected String clientId;
+    protected String clientSecret;
+    protected String redirectUri;
+    protected String webServerType;
+    protected Map<String, Object> parsedOptions;
+    protected VcenterAuthorizationStubUtil authorizationStubUtil;
+    protected StubConfiguration sessionStubConfig;
+    protected boolean skipServerVerification = true;
+    private VM vmService;
+    protected void parseArgs(String[] args) throws ConfigurationException, ParseException, IOException {
+        ParametersHelper paramsHelper = null;
+        Option datacenterOption = Option.builder()
+                .longOpt("datacenter")
+                .desc("OPTIONAL: Specify the name of the Datacenter"
+                        + " to list the Vms in it.")
+                .argName("DATACENTER")
+                .required(false)
+                .hasArg()
+                .build();
+        Option vmFolderOption = Option.builder()
+                .longOpt("vmfolder")
+                .desc("OPTIONAL: Specify the name of the VM Folder to list the"
+                        + " Vms in it.")
+                .argName("VM FOLDER")
+                .required(false)
+                .hasArg()
+                .build();
+        Option clusterOption = Option.builder()
+                .longOpt("cluster")
+                .desc("OPTIONAL: Specify the name of the Cluster to list the"
+                        + " Vms in it.")
+                .argName("CLUSTER")
+                .required(false)
+                .hasArg()
+                .build();
+        Option serverOption = Option.builder()
+                .required(true)
+                .hasArg()
+                .argName("SERVER")
+                .longOpt("server")
+                .desc("hostname of vCenter Server")
+                .build();
+        Option clientIdOption = Option.builder()
+                  .hasArg()
+                  .argName("CLIENT_ID")
+                  .longOpt("clientId")
+                  .desc("client id of OAUTH registered app")
+                  .build();
+        Option clientSecretOption = Option.builder()
+                  .hasArg()
+                  .argName("CLIENT_SECRET")
+                  .longOpt("clientSecret")
+                  .desc("client secret of OAUTH registered app")
+                  .build();
+        Option redirectUriOption = Option.builder()
+                .required(false)
+                .hasArg()
+                .argName("REDIRECT_URI")
+                .longOpt("redirect_uri")
+                .desc("redirect uri of the CSP registerd app")
+                .build();
+        Option webServerTypeOption = Option.builder()
+                .required(true)
+                .hasArg()
+                .argName("WEBSERVERTYPE")
+                .longOpt("webServerType")
+                .desc("webServer Type for redirect Uri either local or remote")
+                .build();
+        Option skipServerVerificationOption =
+                Option.builder()
+                      .required(false)
+                      .longOpt("skip-server-verification")
+                      .type(Boolean.class)
+                      .desc("OPTIONAL: Specify this option if you do not "
+                              + "want to perform SSL certificate "
+                              + "verification.\nNOTE: Circumventing SSL "
+                              + "trust in this manner is unsafe and should "
+                              + "not be used with production code. "
+                              + "This is ONLY FOR THE PURPOSE OF "
+                              + "DEVELOPMENT ENVIRONMENT.")
+                      .build();
+        Option configFileJson =  Option.builder()
+                .required(false)
+                .longOpt("oauth_app_json")
+                .hasArg()
+                .desc("OPTIONAL: Specify this option when identity provider meta data avaiable in config file")
+                .build();
+        List<Option> optionList = Arrays.asList(vmFolderOption,
+                datacenterOption, clusterOption, serverOption, clientIdOption,
+                clientSecretOption, redirectUriOption, webServerTypeOption, 
+                skipServerVerificationOption, configFileJson);
+        paramsHelper = new ParametersHelper(optionList);
+        this.parsedOptions = paramsHelper.parse(args,
+                this.getClass().getName());
+        this.parsedOptions=paramsHelper.parseJsonConfig(args);
+        this.vmFolderName = (String) parsedOptions.get("vmfolder");
+        this.datacenterName = (String) parsedOptions.get("datacenter");
+        this.clusterName = (String) parsedOptions.get("cluster");
+        this.clientId=(String) parsedOptions.get("clientId");
+        this.clientSecret=(String) parsedOptions.get("clientSecret");
+        this.server=(String) parsedOptions.get("server");
+        this.redirectUri=(String) parsedOptions.get("redirect_uri");
+        this.webServerType=(String) parsedOptions.get("webServerType");
+        Object skipServerVerificationObj =
+                parsedOptions.get("skip-server-verification");
+        if(skipServerVerificationObj != null) {
+            this.skipServerVerification =
+                    (Boolean) skipServerVerificationObj;
+        } else {
+            this.skipServerVerification = false;
+        }
+    }
+    protected void login() throws Exception {
+        authorizationStubUtil = new VcenterAuthorizationStubUtil();
+        sessionStubConfig = authorizationStubUtil.loginUsingAuthCodeGrantType(server, 
+                clientId, clientSecret, redirectUri, webServerType, skipServerVerification);
+    }
+    protected void setup() throws Exception {
+        vmService = authorizationStubUtil.getStub(VM.class, sessionStubConfig);
+    }
+    /**
+     * The main method.
+     * @param args the arguments
+     * @throws Exception the exception
+     */
+    public static void main(String[] args) throws Exception {
+        try {
+            new ListVMsAuthCodeGrant().execute(args);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            System.exit(0);
+        }
+    }
+    private void execute(String[] args) throws Exception{
+        parseArgs(args);
+        login();
+        setup();
+        List<Summary> vmList = vmService.list(new Builder().build());
+        System.out.println("----------------------------------------");
+        System.out.println("List of VMs " + vmList.size());
+        for (Summary vmSummary : vmList) {
+            System.out.println(vmSummary);
+        }
+        System.out.println("----------------------------------------");
+        authorizationStubUtil.logout();
+    }
+}
diff --git a/src/main/java/vmware/samples/vcenter/identity/granttypes/ListVMsClientCredentials.java b/src/main/java/vmware/samples/vcenter/identity/granttypes/ListVMsClientCredentials.java
new file mode 100644
index 00000000000..662943b69ae
--- /dev/null
+++ b/src/main/java/vmware/samples/vcenter/identity/granttypes/ListVMsClientCredentials.java
@@ -0,0 +1,185 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+package vmware.samples.vcenter.identity.granttypes;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.configuration.ConfigurationException;
+
+import com.vmware.vapi.bindings.StubConfiguration;
+import com.vmware.vcenter.VM;
+import com.vmware.vcenter.VMTypes.FilterSpec.Builder;
+import com.vmware.vcenter.VMTypes.Summary;
+
+import vmware.samples.common.ParametersHelper;
+import vmware.samples.common.VcenterAuthorizationStubUtil;
+
+/**
+ * Description: Demonstrates listing of VMs present in vCenter using Client
+ * Credentials grant type for oauth2. Client Credentials grant type: The Client
+ * Credentials grant type is used by clients to obtain an access token outside
+ * of the context of a user.This is typically used by clients to access
+ * resources about themselves rather than to access a user's resources. Author:
+ * VMware, Inc.
+ * Sample Prerequisites: vCenter 7.0
+ * Arguments:
+ * VcenterServer: Vcenter server IP or Host name. clientId: client Id of registered app on CSP.
+ * clientSecret: Client Secret key of Oauth registered app.
+ * orgId: orgId of the Oauth registered app.
+ */
+public class ListVMsClientCredentials {
+    protected String vmFolderName;
+    protected String datacenterName;
+    protected String clusterName;
+    protected String server;
+    protected String clientId;
+    protected String clientSecret;
+    protected String orgId;
+    protected Map<String, Object> parsedOptions;
+    protected VcenterAuthorizationStubUtil authorizationStubUtil;
+    protected StubConfiguration sessionStubConfig;
+    protected Boolean skipServerVerification = true;
+    private VM vmService;
+    protected void parseArgs(String[] args) throws ConfigurationException, ParseException {
+    ParametersHelper paramsHelper = null;
+    Option datacenterOption = Option.builder()
+            .longOpt("datacenter")
+            .desc("OPTIONAL: Specify the name of the Datacenter"
+                    + " to list the Vms in it.")
+            .argName("DATACENTER")
+            .required(false)
+            .hasArg()
+            .build();
+    Option vmFolderOption = Option.builder()
+            .longOpt("vmfolder")
+            .desc("OPTIONAL: Specify the name of the VM Folder to list the"
+                    + " Vms in it.")
+            .argName("VM FOLDER")
+            .required(false)
+            .hasArg()
+            .build();
+    Option clusterOption = Option.builder()
+            .longOpt("cluster")
+            .desc("OPTIONAL: Specify the name of the Cluster to list the"
+                    + " Vms in it.")
+            .argName("CLUSTER")
+            .required(false)
+            .hasArg()
+            .build();
+    Option serverOption = Option.builder()
+            .required(true)
+            .hasArg()
+            .argName("SERVER")
+            .longOpt("server")
+            .desc("hostname of vCenter Server")
+            .build();
+    Option clientIdOption = Option.builder()
+              .hasArg()
+              .argName("CLIENT_ID")
+              .longOpt("clientId")
+              .desc("client id of OAUTH registered app")
+              .build();
+    Option clientSecretOption = Option.builder()
+              .hasArg()
+              .argName("CLIENT_SECRET")
+              .longOpt("clientSecret")
+              .desc("client secret of OAUTH registered app")
+              .build();
+  //currently orgid supports only in cloud service platform provider(CSP) registered Oauth app.
+    Option orgIdOption = Option.builder()
+            .required(false)
+            .hasArg()
+            .argName("ORGID")
+            .longOpt("orgId")
+            .desc("org id of the CSP registerd app")
+            .build();
+    Option skipServerVerificationOption =
+            Option.builder()
+                  .required(false)
+                  .longOpt("skip-server-verification")
+                  .type(Boolean.class)
+                  .desc("OPTIONAL: Specify this option if you do not "
+                          + "want to perform SSL certificate "
+                          + "verification.\nNOTE: Circumventing SSL "
+                          + "trust in this manner is unsafe and should "
+                          + "not be used with production code. "
+                          + "This is ONLY FOR THE PURPOSE OF "
+                          + "DEVELOPMENT ENVIRONMENT.")
+                  .build();
+    Option configFileJson =  Option.builder()
+            .required(false)
+            .longOpt("oauth_app_json")
+            .hasArg()
+            .desc("OPTIONAL: Specify this option when identity provider meta data avaiable in config file")
+            .build();
+    List<Option> optionList = Arrays.asList(vmFolderOption,
+            datacenterOption, clusterOption, serverOption, clientIdOption, clientSecretOption,
+            orgIdOption, skipServerVerificationOption, configFileJson);
+    paramsHelper = new ParametersHelper(optionList);
+    this.parsedOptions = paramsHelper.parse(args,
+            this.getClass().getName());
+    this.parsedOptions=paramsHelper.parseJsonConfig(args);
+    this.vmFolderName = (String) parsedOptions.get("vmfolder");
+    this.datacenterName = (String) parsedOptions.get("datacenter");
+    this.clusterName = (String) parsedOptions.get("cluster");
+    this.clientId=(String) parsedOptions.get("clientId");
+    this.clientSecret=(String) parsedOptions.get("clientSecret");
+    this.server=(String) parsedOptions.get("server");
+    this.orgId=(String) parsedOptions.get("orgId");
+    Object skipServerVerificationObj =
+            parsedOptions.get("skip-server-verification");
+    if(skipServerVerificationObj != null) {
+        this.skipServerVerification =
+                (Boolean) skipServerVerificationObj;
+    } else {
+        this.skipServerVerification = false;
+    }
+    }
+    protected void login() throws Exception {
+        authorizationStubUtil = new VcenterAuthorizationStubUtil();
+        sessionStubConfig = authorizationStubUtil.
+                loginUsingClientCredentialsGrantType(server, clientId, clientSecret, orgId, skipServerVerification);
+    }
+    protected void setup() throws Exception {
+        vmService = authorizationStubUtil.getStub(VM.class, sessionStubConfig);
+    }
+    /**
+     * The main method.
+     * @param args the arguments
+     * @throws Exception the exception
+     */
+    public static void main(String[] args) throws Exception {
+        try {
+            new ListVMsClientCredentials().execute(args);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            System.exit(0);
+        }
+    }
+    private void execute(String[] args) throws Exception {
+        parseArgs(args);
+        login();
+        setup();
+        List<Summary> vmList = vmService.list(new Builder().build());
+        System.out.println("----------------------------------------");
+        System.out.println("List of VMs " + vmList.size());
+        for (Summary vmSummary : vmList) {
+            System.out.println(vmSummary);
+        }
+        System.out.println("----------------------------------------");
+        authorizationStubUtil.logout();
+    }
+}
diff --git a/src/main/java/vmware/samples/vcenter/identity/granttypes/ListVMsPasswordGrant.java b/src/main/java/vmware/samples/vcenter/identity/granttypes/ListVMsPasswordGrant.java
new file mode 100644
index 00000000000..b8422002a89
--- /dev/null
+++ b/src/main/java/vmware/samples/vcenter/identity/granttypes/ListVMsPasswordGrant.java
@@ -0,0 +1,190 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+package vmware.samples.vcenter.identity.granttypes;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.configuration.ConfigurationException;
+import com.vmware.vapi.bindings.StubConfiguration;
+import com.vmware.vcenter.VM;
+import com.vmware.vcenter.VMTypes.FilterSpec.Builder;
+import com.vmware.vcenter.VMTypes.Summary;
+import vmware.samples.common.ParametersHelper;
+import vmware.samples.common.VcenterAuthorizationStubUtil;
+/**
+ * Description: Demonstrated Listing of VMs present in vCenter using Password grant type for oauth2.
+ * Password grant type: The Password grant type is used by first-party clients to exchange a user's credentials
+ * for an access token.Since this involves the client asking the user for their password, it should not be used by.
+ * third party clients. In this flow, the user's username and password are exchanged directly for an access token.
+ * Author: VMware, Inc.
+ * Sample Prerequisites: vCenter 7.0
+ * Arguments:
+ * VcenterServer: vcenter server IP or Host name.
+ * clientId: client Id of Oauth registered app.
+ * clientSecret: Client Secret key of Oauth registered app.
+ * userName: user name provided while creating the app in OIDC/Oauth App.
+ * passWord: passWord provided while creating the app in OIDC/Oauth App.
+ */
+public class ListVMsPasswordGrant {
+    protected String vmFolderName;
+    protected String datacenterName;
+    protected String clusterName;
+    protected String server;
+    protected String clientId;
+    protected String clientSecret;
+    protected String userName;
+    protected String passWord;
+    protected Map<String, Object> parsedOptions;
+    protected VcenterAuthorizationStubUtil authorizationStubUtil;
+    protected StubConfiguration sessionStubConfig;
+    protected Boolean skipServerVerification = true;
+    private VM vmService;
+    protected void parseArgs(String[] args) throws ConfigurationException, ParseException {
+    ParametersHelper paramsHelper = null;
+    Option datacenterOption = Option.builder()
+            .longOpt("datacenter")
+            .desc("OPTIONAL: Specify the name of the Datacenter"
+                    + " to list the Vms in it.")
+            .argName("DATACENTER")
+            .required(false)
+            .hasArg()
+            .build();
+    Option vmFolderOption = Option.builder()
+            .longOpt("vmfolder")
+            .desc("OPTIONAL: Specify the name of the VM Folder to list the"
+                    + " Vms in it.")
+            .argName("VM FOLDER")
+            .required(false)
+            .hasArg()
+            .build();
+    Option clusterOption = Option.builder()
+            .longOpt("cluster")
+            .desc("OPTIONAL: Specify the name of the Cluster to list the"
+                    + " Vms in it.")
+            .argName("CLUSTER")
+            .required(false)
+            .hasArg()
+            .build();
+    Option serverOption = Option.builder()
+            .required(true)
+            .hasArg()
+            .argName("SERVER")
+            .longOpt("server")
+            .desc("hostname of vCenter Server")
+            .build();
+    Option clientIdOption = Option.builder()
+              .hasArg()
+              .argName("CLIENT_ID")
+              .longOpt("clientId")
+              .desc("client id of the CSP registered app")
+              .build();
+    Option clientSecretOption = Option.builder()
+              .hasArg()
+              .argName("CLIENT_SECRET")
+              .longOpt("clientSecret")
+              .desc("client secret of the CSP registered app")
+              .build();
+    Option userNameOption = Option.builder()
+            .required(true)
+            .hasArg()
+            .argName("USER_NAME")
+            .longOpt("userName")
+            .desc("userName of the CSP registerd app")
+            .build();
+    Option passWordOption = Option.builder()
+            .required(true)
+            .hasArg()
+            .argName("PAASWORD")
+            .longOpt("passWord")
+            .desc("passWord of the CSP registerd app")
+            .build();
+    Option skipServerVerificationOption =
+            Option.builder()
+                  .required(false)
+                  .longOpt("skip-server-verification")
+                  .type(Boolean.class)
+                  .desc("OPTIONAL: Specify this option if you do not "
+                          + "want to perform SSL certificate "
+                          + "verification.\nNOTE: Circumventing SSL "
+                          + "trust in this manner is unsafe and should "
+                          + "not be used with production code. "
+                          + "This is ONLY FOR THE PURPOSE OF "
+                          + "DEVELOPMENT ENVIRONMENT.")
+                  .build();
+    Option configFileJson =  Option.builder()
+            .required(false)
+            .longOpt("oauth_app_json")
+            .hasArg()
+            .desc("OPTIONAL: Specify this option when identity provider meta data avaiable in config file")
+            .build();
+    List<Option> optionList = Arrays.asList(vmFolderOption,
+            datacenterOption, clusterOption, serverOption, clientIdOption,
+            clientSecretOption, userNameOption, passWordOption, skipServerVerificationOption, configFileJson);
+    paramsHelper = new ParametersHelper(optionList);
+    this.parsedOptions = paramsHelper.parse(args,
+            this.getClass().getName());
+    this.parsedOptions=paramsHelper.parseJsonConfig(args);
+    this.vmFolderName = (String) parsedOptions.get("vmfolder");
+    this.datacenterName = (String) parsedOptions.get("datacenter");
+    this.clusterName = (String) parsedOptions.get("cluster");
+    this.clientId = (String) parsedOptions.get("clientId");
+    this.clientSecret = (String) parsedOptions.get("clientSecret");
+    this.server = (String) parsedOptions.get("server");
+    this.userName = (String) parsedOptions.get("userName");
+    this.passWord = (String) parsedOptions.get("passWord");
+    Object skipServerVerificationObj =
+            parsedOptions.get("skip-server-verification");
+    if(skipServerVerificationObj != null) {
+        this.skipServerVerification =
+                (Boolean) skipServerVerificationObj;
+    } else {
+        this.skipServerVerification = false;
+    }}
+    protected void login() throws Exception {
+        authorizationStubUtil = new VcenterAuthorizationStubUtil();
+        sessionStubConfig = authorizationStubUtil.
+                loginUsingPasswordGrantType(server, clientId, clientSecret, userName, passWord, skipServerVerification);
+    }
+    protected void setup() throws Exception {
+        vmService = authorizationStubUtil.getStub(VM.class, sessionStubConfig);
+    }
+    /**
+     * The main method.
+     * @param args the arguments
+     * @throws Exception the exception
+     */
+    public static void main(String[] args) throws Exception {
+        try {
+            new ListVMsPasswordGrant().execute(args);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            System.exit(0);
+        }
+    }
+    private void execute(String[] args) throws Exception {
+        parseArgs(args);
+        login();
+        setup();
+        List<Summary> vmList = vmService.list(new Builder().build());
+        System.out.println("----------------------------------------");
+        System.out.println("List of VMs " + vmList.size());
+        for (Summary vmSummary : vmList) {
+            System.out.println(vmSummary);
+        }
+        System.out.println("----------------------------------------");
+        authorizationStubUtil.logout();
+    }
+
+}
diff --git a/src/main/java/vmware/samples/vcenter/identity/granttypes/ListVMsRefreshTokenGrant.java b/src/main/java/vmware/samples/vcenter/identity/granttypes/ListVMsRefreshTokenGrant.java
new file mode 100644
index 00000000000..f5719e301bd
--- /dev/null
+++ b/src/main/java/vmware/samples/vcenter/identity/granttypes/ListVMsRefreshTokenGrant.java
@@ -0,0 +1,186 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+package vmware.samples.vcenter.identity.granttypes;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.configuration.ConfigurationException;
+
+import com.vmware.vapi.bindings.StubConfiguration;
+import com.vmware.vcenter.VM;
+import com.vmware.vcenter.VMTypes.FilterSpec.Builder;
+import com.vmware.vcenter.VMTypes.Summary;
+
+import vmware.samples.common.ParametersHelper;
+import vmware.samples.common.VcenterAuthorizationStubUtil;
+/**
+ * Description: Demonstrates Listing of VMs present in vCenter using Refresh Token grant type for oauth2.
+ * Refresh Token grant type: The Refresh Token grant type is used by clients to exchange a refresh token for an access
+ * token when the access token has expired.
+ * This allows clients to continue to have a valid access token without further interaction with the user.
+ * Author: VMware, Inc.
+ * Sample Prerequisites: vCenter 7.0
+ * Arguments:
+ * VcenterServer: vcenter server IP or Host name.
+ * clientId: client Id of registered app on CSP.
+ * clientSecret: Client Secret key of Oauth registered app.
+ * refreshToken: refreshToken, which is taken from by running auth code grant type sample.
+ * NOTE: The Refresh Token can be obtained by running the ListVMsAuthCodeGrant sample.
+ */
+public class ListVMsRefreshTokenGrant {
+    protected String vmFolderName;
+    protected String datacenterName;
+    protected String clusterName;
+    protected String server;
+    protected String clientId;
+    protected String clientSecret;
+    protected String refreshToken;
+    protected Map<String, Object> parsedOptions;
+    protected VcenterAuthorizationStubUtil authorizationStubUtil;
+    protected StubConfiguration sessionStubConfig;
+    protected Boolean skipServerVerification = true;
+    private VM vmService;
+    protected void parseArgs(String[] args) throws ConfigurationException, ParseException{
+    ParametersHelper paramsHelper = null;
+    Option datacenterOption = Option.builder()
+            .longOpt("datacenter")
+            .desc("OPTIONAL: Specify the name of the Datacenter"
+                    + " to list the Vms in it.")
+            .argName("DATACENTER")
+            .required(false)
+            .hasArg()
+            .build();
+    Option vmFolderOption = Option.builder()
+            .longOpt("vmfolder")
+            .desc("OPTIONAL: Specify the name of the VM Folder to list the"
+                    + " Vms in it.")
+            .argName("VM FOLDER")
+            .required(false)
+            .hasArg()
+            .build();
+    Option clusterOption = Option.builder()
+            .longOpt("cluster")
+            .desc("OPTIONAL: Specify the name of the Cluster to list the"
+                    + " Vms in it.")
+            .argName("CLUSTER")
+            .required(false)
+            .hasArg()
+            .build();
+    Option serverOption = Option.builder()
+            .required(true)
+            .hasArg()
+            .argName("SERVER")
+            .longOpt("server")
+            .desc("hostname of vCenter Server")
+            .build();
+    Option clientIdOption = Option.builder()
+              .hasArg()
+              .argName("CLIENT_ID")
+              .longOpt("clientId")
+              .desc("client id of Oauth registered app")
+              .build();
+    Option clientSecretOption = Option.builder()
+              .hasArg()
+              .argName("CLIENT_SECRET")
+              .longOpt("clientSecret")
+              .desc("client secret of Oauth registered app")
+              .build();
+  //currently orgid supports only in cloud service platform provider(CSP) registered Oauth app.
+    Option orgIdOption = Option.builder()
+            .required(false)
+            .hasArg()
+            .argName("REFRESHTOKEN")
+            .longOpt("refreshToken")
+            .desc("refreshToken of Oauth registerd app")
+            .build();
+    Option skipServerVerificationOption =
+            Option.builder()
+                  .required(false)
+                  .longOpt("skip-server-verification")
+                  .type(Boolean.class)
+                  .desc("OPTIONAL: Specify this option if you do not "
+                          + "want to perform SSL certificate "
+                          + "verification.\nNOTE: Circumventing SSL "
+                          + "trust in this manner is unsafe and should "
+                          + "not be used with production code. "
+                          + "This is ONLY FOR THE PURPOSE OF "
+                          + "DEVELOPMENT ENVIRONMENT.")
+                  .build();
+    Option configFileJson =  Option.builder()
+            .required(false)
+            .longOpt("oauth_app_json")
+            .hasArg()
+            .desc("OPTIONAL: Specify this option when identity provider meta data avaiable in config file")
+            .build();
+    List<Option> optionList = Arrays.asList(vmFolderOption,
+            datacenterOption, clusterOption, serverOption, clientIdOption, clientSecretOption,
+            orgIdOption, skipServerVerificationOption, configFileJson);
+    paramsHelper = new ParametersHelper(optionList);
+    this.parsedOptions = paramsHelper.parse(args,
+            this.getClass().getName());
+    this.parsedOptions=paramsHelper.parseJsonConfig(args);
+    this.vmFolderName = (String) parsedOptions.get("vmfolder");
+    this.datacenterName = (String) parsedOptions.get("datacenter");
+    this.clusterName = (String) parsedOptions.get("cluster");
+    this.clientId=(String) parsedOptions.get("clientId");
+    this.clientSecret=(String) parsedOptions.get("clientSecret");
+    this.server=(String) parsedOptions.get("server");
+    this.refreshToken=(String) parsedOptions.get("refreshToken");
+    Object skipServerVerificationObj =
+            parsedOptions.get("skip-server-verification");
+    if(skipServerVerificationObj != null) {
+        this.skipServerVerification =
+                (Boolean) skipServerVerificationObj;
+    } else {
+        this.skipServerVerification = false;
+    }
+    }
+    protected void login() throws Exception {
+        authorizationStubUtil = new VcenterAuthorizationStubUtil();
+        sessionStubConfig = authorizationStubUtil.
+                loginUsingRefreshTokenGrantType(server, clientId, clientSecret, refreshToken, skipServerVerification);
+    }
+    protected void setup() throws Exception {
+        vmService = authorizationStubUtil.getStub(VM.class, sessionStubConfig);
+    }
+    /**
+     * The main method.
+     * @param args the arguments
+     * @throws Exception the exception
+     */
+    public static void main(String[] args) throws Exception {
+        try {
+            new ListVMsRefreshTokenGrant().execute(args);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            System.exit(0);
+        }
+    }
+    private void execute(String[] args) throws Exception {
+        parseArgs(args);
+        login();
+        setup();
+        List<Summary> vmList = vmService.list(new Builder().build());
+        System.out.println("----------------------------------------");
+        System.out.println("List of VMs " + vmList.size());
+        for (Summary vmSummary : vmList) {
+            System.out.println(vmSummary);
+        }
+        System.out.println("----------------------------------------");
+        authorizationStubUtil.logout();
+    }
+}
diff --git a/src/main/java/vmware/samples/vcenter/identity/helpers/VcenterIdentityProvider.java b/src/main/java/vmware/samples/vcenter/identity/helpers/VcenterIdentityProvider.java
new file mode 100644
index 00000000000..a556d068662
--- /dev/null
+++ b/src/main/java/vmware/samples/vcenter/identity/helpers/VcenterIdentityProvider.java
@@ -0,0 +1,111 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+package vmware.samples.vcenter.identity.helpers;
+
+import java.util.List;
+
+import com.vmware.authorization.IdentityProviderType;
+import com.vmware.authorization.oidc.OIDCType;
+import com.vmware.authorization.oauth2.Oauth2Type;
+import com.vmware.idp.IDPType;
+import com.vmware.vcenter.identity.Providers;
+import com.vmware.vcenter.identity.ProvidersTypes.Summary;
+
+import vmware.samples.common.authentication.VapiAuthenticationHelper;
+/**
+ * Description: Containing generic method implementation required to get identity providers list.
+ * Author: VMware, Inc.
+ * Sample Prerequisites: vCenter 6.8.X
+ */
+public class VcenterIdentityProvider {
+	
+	private VapiAuthenticationHelper vAuthHelper = new VapiAuthenticationHelper();
+	 
+ 	private Providers providersService;
+		
+	/**
+	 * Gets the identity providers.
+	 *
+	 * @param server the server
+	 * @return the identity providers
+	 * @throws Exception the exception
+	 */
+	public List<Summary> getIdentityProviders(String vCenterServer,
+			boolean skipServerVerification) throws Exception {
+		this.vAuthHelper.createStubFactory(vCenterServer, skipServerVerification);
+		this.providersService = this.vAuthHelper.getStubFactory().createStub(Providers.class);
+		List<Summary> identityProviders = providersService.list();
+		return identityProviders;
+	}
+
+	/**
+	 * Returns the default Identity Provider for the given vCenter Server
+	 * 
+	 * @param server
+	 * @return
+	 * @throws Exception 
+	 */
+	public Summary getDefaultIdentityProviderSummary(String vCenterServer,
+			boolean skipServerVerification) throws Exception
+	{
+		Summary providerSummary = null;
+		List<Summary> identityProviders = getIdentityProviders(vCenterServer, skipServerVerification);
+		if(identityProviders.isEmpty())
+		{
+			System.out.println("Provider Empty");
+			return providerSummary;
+		}
+		for (Summary summary : identityProviders) {
+			if (summary.getIsDefault())
+			{
+				providerSummary = summary;
+				break;
+			}
+		}
+		return providerSummary;
+	}
+	
+	/**
+	 * Returns the default Identity Provider for the given vCenter Server
+	 * 
+	 * @param server
+	 * @return
+	 * @throws Exception 
+	 */
+	public IdentityProviderType getDefaultIdentityProviderWithType(String vCenterServer,
+			boolean skipServerVerification) throws Exception
+	{
+
+		Summary summary = getDefaultIdentityProviderSummary(vCenterServer, skipServerVerification);
+		IdentityProviderType providerType = getIdentityWithTypeFromSummary(summary);
+		return providerType;
+	}
+	
+	private IdentityProviderType getIdentityWithTypeFromSummary(Summary summary) {
+		if (null == summary)
+			return null;
+		IdentityProviderType identityType = null;
+		IDPType idpType = IDPType.fromName(summary.getConfigTag().name());
+		if(IDPType.OAUTH2.equals(idpType)) {
+			identityType = new Oauth2Type(summary.getOauth2().getAuthEndpoint(),
+					summary.getOauth2().getTokenEndpoint(), 
+					summary.getOauth2().getAuthQueryParams());
+		}else
+			identityType  = new OIDCType(summary.getOidc().getAuthEndpoint(),
+					summary.getOidc().getTokenEndpoint(), 
+					summary.getOidc().getAuthQueryParams()); 
+		return identityType;
+	}
+
+}
+
diff --git a/src/main/java/vmware/samples/vcenter/identity/helpers/VcenterTokenExchange.java b/src/main/java/vmware/samples/vcenter/identity/helpers/VcenterTokenExchange.java
new file mode 100644
index 00000000000..08e34afabef
--- /dev/null
+++ b/src/main/java/vmware/samples/vcenter/identity/helpers/VcenterTokenExchange.java
@@ -0,0 +1,73 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+package vmware.samples.vcenter.identity.helpers;
+
+import javax.xml.bind.DatatypeConverter;
+
+import com.vmware.vapi.bindings.StubConfiguration;
+import com.vmware.vapi.cis.authn.SecurityContextFactory;
+import com.vmware.vapi.core.ExecutionContext.SecurityContext;
+import com.vmware.vapi.saml.DefaultTokenFactory;
+import com.vmware.vapi.saml.SamlToken;
+import com.vmware.vcenter.tokenservice.TokenExchange;
+import com.vmware.vcenter.tokenservice.TokenExchangeTypes;
+
+import vmware.samples.common.authentication.VapiAuthenticationHelper;
+
+
+public class VcenterTokenExchange {
+	private VapiAuthenticationHelper vapiHelper = new VapiAuthenticationHelper(); 
+	
+	public VcenterTokenExchange() {}
+	
+    /**
+     * Hits the token exchange service to get the SAML token to login to the
+     * corresponding vcenter.
+     * @param authenticationHelper the authentication helper
+     * @param access_token         the access token
+     * @param id_token             the id token
+     * @param vcenterHostname      the Vcenter host name
+     * @param httpConfiguration    the http configuration
+     * @return the saml token of type SamlToken
+     */
+    public SamlToken getSAMLToken(String access_token, String id_token, String vcenterHostname) {
+        SamlToken samlBearerToken = null;
+        try {
+            SecurityContext context = SecurityContextFactory.createOAuthSecurityContext(access_token.toCharArray());
+            StubConfiguration sessionStubConfig = new StubConfiguration(context);
+            TokenExchangeTypes.ExchangeSpec spec = new TokenExchangeTypes.ExchangeSpec();
+            //ID Token have valid values only for authorization code grant type
+            if(!"null".equalsIgnoreCase(id_token)) {
+                spec.setActorToken(id_token);
+                spec.setActorTokenType("urn:ietf:params:oauth:token-type:id_token");
+            }
+            spec.setGrantType("urn:ietf:params:oauth:grant-type:token-exchange");
+            spec.setRequestedTokenType("urn:ietf:params:oauth:token-type:saml2");
+            spec.setSubjectTokenType("urn:ietf:params:oauth:token-type:access_token");
+            spec.setSubjectToken(access_token);
+            vapiHelper.createStubFactory(vcenterHostname, true);
+            TokenExchangeTypes.Info info = new TokenExchangeTypes.Info();
+            TokenExchange tokenExchange = vapiHelper.getStubFactory().createStub(TokenExchange.class,
+                    sessionStubConfig);
+            info = tokenExchange.exchange(spec);
+            byte[] decodedBytes = DatatypeConverter.parseBase64Binary(info.getAccessToken());
+            String decodedSamlToken = new String(decodedBytes, "UTF-8");
+            samlBearerToken = DefaultTokenFactory.createToken(decodedSamlToken);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            System.exit(0);
+        }
+        return samlBearerToken;
+
+    }
+}
diff --git a/src/main/java/vmware/samples/vcenter/vm/clone/CloneVM.java b/src/main/java/vmware/samples/vcenter/vm/clone/CloneVM.java
new file mode 100644
index 00000000000..7a421ecd595
--- /dev/null
+++ b/src/main/java/vmware/samples/vcenter/vm/clone/CloneVM.java
@@ -0,0 +1,242 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+package vmware.samples.vcenter.vm.clone;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.apache.commons.cli.Option;
+
+import com.vmware.vcenter.VM;
+import com.vmware.vcenter.VMTypes;
+import com.vmware.vcenter.VMTypes.DiskCloneSpec;
+
+import vmware.samples.common.SamplesAbstractBase;
+
+/**
+ * Description: Demonstrates how to clone a VM with optional destination
+ * VM folder, datastore, host, cluster, resource pool, disk datastore.
+ *
+ * Author: VMware, Inc.
+ * Sample Prerequisites:
+ * The sample needs a source VM and VM name to clone as.
+ */
+public class CloneVM extends SamplesAbstractBase {
+    private String sourceVm;
+    private String vmFolder;
+    private String vmName;
+    private String datastore;
+    private String cluster;
+    private String resourcePool;
+    private String host;
+    private String diskUpdate;
+    private String diskRemove;
+    private Boolean powerOn;
+    private VM vmService;
+    private String resultVMId;
+
+    /**
+     * Define the options specific to this sample and configure the sample using
+     * command-line arguments or a config file
+     *
+     * @param args command line arguments passed to the sample
+     */
+    protected void parseArgs(String[] args) {
+        Option sourceVmOption = Option.builder()
+            .longOpt("sourcevm")
+            .desc("The VM id of the VM to clone from.")
+            .argName("SOURCEVM")
+            .required(true)
+            .hasArg()
+            .build();
+        Option vmNameOption = Option.builder()
+            .longOpt("vmname")
+            .desc("The name of the vm to be created.")
+            .argName("VMNAME")
+            .required(true)
+            .hasArg()
+            .build();
+        Option vmFolderOption = Option.builder()
+            .longOpt("vmfolder")
+            .desc("OPTIONAL: The ID of the vm folder in which to clone the vm to.")
+            .argName("VM FOLDER")
+            .required(false)
+            .hasArg()
+            .build();
+        Option datastoreOption = Option.builder()
+            .longOpt("datastore")
+            .desc("OPTIONAL: The ID of the datastore in which to clone the vm to")
+            .required(false)
+            .argName("DATASTORE")
+            .hasArg()
+            .build();
+        Option clusterOption = Option.builder()
+            .longOpt("cluster")
+            .desc("OPTIONAL: The ID of the cluster in which to clone the vm to.")
+            .argName("CLUSTER")
+            .required(false)
+            .hasArg()
+            .build();
+        Option resourcePoolOption = Option.builder()
+            .longOpt("resourcepool")
+            .desc("OPTIONAL: The ID of the resource pool in which to clone the vm to.")
+            .argName("RESOURCE POOL")
+            .required(false)
+            .hasArg()
+            .build();
+        Option hostOption = Option.builder()
+            .longOpt("host")
+            .desc("OPTIONAL: The ID of the host in which to clone the vm to.")
+            .argName("HOST")
+            .required(false)
+            .hasArg()
+            .build();
+        Option diskUpdateOption = Option.builder()
+            .longOpt("diskupdate")
+            .desc("OPTIONAL: Comma separated disk-ID:datastore-ID map.")
+            .argName("DISK UPDATE")
+            .required(false)
+            .hasArg()
+            .build();
+        Option diskRemoveOption = Option.builder()
+            .longOpt("diskremove")
+            .desc("OPTIONAL: Comma separated disk-ID to remove.")
+            .argName("DISK REMOVE")
+            .required(false)
+            .hasArg()
+            .build();
+        Option powerOnOption = Option.builder()
+            .longOpt("poweron")
+            .desc("OPTIONAL: Power on the cloned VM after the operation.")
+            .argName("POWER-ON")
+            .required(false)
+            .build();
+        List<Option> optionList = Arrays.asList(sourceVmOption,
+            vmNameOption,
+            vmFolderOption,
+            datastoreOption,
+            clusterOption,
+            resourcePoolOption,
+            hostOption,
+            diskUpdateOption,
+            diskRemoveOption,
+            powerOnOption);
+
+        super.parseArgs(optionList, args);
+        this.sourceVm = (String) parsedOptions.get("sourcevm");
+        this.vmFolder = (String) parsedOptions.get("vmfolder");
+        this.vmName = (String) parsedOptions.get("vmname");
+        this.datastore = (String) parsedOptions.get("datastore");
+        this.cluster = (String) parsedOptions.get("cluster");
+        this.resourcePool = (String) parsedOptions.get("resourcepool");
+        this.host = (String) parsedOptions.get("host");
+        this.diskUpdate = (String) parsedOptions.get("diskupdate");
+        this.diskRemove = (String) parsedOptions.get("diskremove");
+        this.powerOn = (Boolean) parsedOptions.get("poweron");
+    }
+
+    protected void setup() throws Exception {
+        this.vmService = vapiAuthHelper.getStubFactory().createStub(VM.class,
+            sessionStubConfig);
+    }
+
+    protected void run() throws Exception {
+        // Get a placement spec
+        VMTypes.ClonePlacementSpec vmClonePlacementSpec =
+            new VMTypes.ClonePlacementSpec();
+        if (this.vmFolder != null) {
+            vmClonePlacementSpec.setFolder(this.vmFolder);
+        }
+        if (this.cluster != null) {
+            vmClonePlacementSpec.setCluster(this.cluster);
+        }
+        if (this.resourcePool != null) {
+            vmClonePlacementSpec.setResourcePool(this.resourcePool);
+        }
+        if (this.host != null) {
+            vmClonePlacementSpec.setHost(this.host);
+        }
+        if (this.datastore != null) {
+            vmClonePlacementSpec.setDatastore(this.datastore);
+        }
+        // Perform a clone.
+        cloneVM(vmClonePlacementSpec);
+    }
+
+    /*
+     * Settings of clone operation.
+     */
+    private void cloneVM(
+        VMTypes.ClonePlacementSpec vmClonePlacementSpec) {
+        VMTypes.CloneSpec.Builder specBuilder = new VMTypes.CloneSpec.Builder(
+            this.sourceVm, this.vmName).setPlacement(vmClonePlacementSpec).
+            setPowerOn(this.powerOn);
+
+        // Handle mapping of cloning individual disks to other datastores.
+        if (this.diskUpdate != null) {
+            Map<String, DiskCloneSpec> diskUpdateMap =
+                new HashMap<String, DiskCloneSpec>();
+            StringTokenizer tokenizer = new StringTokenizer(this.diskUpdate, ",");
+            while (tokenizer.hasMoreTokens()) {
+                String[] keyValue = tokenizer.nextToken().split(":", 2);
+                DiskCloneSpec spec = new DiskCloneSpec.Builder().
+                    setDatastore(keyValue[1]).build();
+                diskUpdateMap.put(keyValue[0], spec);
+            }
+            specBuilder.setDisksToUpdate(diskUpdateMap);
+        }
+
+        // Handle mapping of removing individual disks from cloned VM.
+        if (this.diskRemove != null) {
+            Set<String> diskRemoveSet = new HashSet<String>();
+            StringTokenizer tokenizer = new StringTokenizer(this.diskRemove, ",");
+            while (tokenizer.hasMoreTokens()) {
+                diskRemoveSet.add(tokenizer.nextToken());
+            }
+            specBuilder.setDisksToRemove(diskRemoveSet);
+        }
+
+        VMTypes.CloneSpec vmCloneSpec = specBuilder.build();
+        System.out.println("\n\n#### Example: Clone VM with spec:\n"
+                           + vmCloneSpec);
+        this.resultVMId = vmService.clone(vmCloneSpec);
+        VMTypes.Info vmInfo = vmService.get(this.resultVMId);
+        System.out.println("\nVM Info:\n" + vmInfo);
+    }
+
+    protected void cleanup() throws Exception {
+        if (this.resultVMId != null) {
+            System.out.println("\n\n#### Deleting the resulting VM");
+            this.vmService.delete(this.resultVMId);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        /*
+         * Execute the sample using the command line arguments or parameters
+         * from the configuration file. This executes the following steps:
+         * 1. Parse the arguments required by the sample
+         * 2. Login to the server
+         * 3. Setup any resources required by the sample run
+         * 4. Run the sample
+         * 5. Cleanup any data created by the sample run, if cleanup=true
+         * 6. Logout of the server
+         */
+        new CloneVM().execute(args);
+    }
+}
diff --git a/src/main/java/vmware/samples/vcenter/vm/instantclone/InstantCloneVM.java b/src/main/java/vmware/samples/vcenter/vm/instantclone/InstantCloneVM.java
new file mode 100644
index 00000000000..0bd50a8f9a5
--- /dev/null
+++ b/src/main/java/vmware/samples/vcenter/vm/instantclone/InstantCloneVM.java
@@ -0,0 +1,171 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+package vmware.samples.vcenter.vm.instantclone;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.cli.Option;
+
+import com.vmware.vcenter.VM;
+import com.vmware.vcenter.VMTypes;
+
+import vmware.samples.common.SamplesAbstractBase;
+
+/**
+ * Description: Demonstrates how to instant clone a VM with optional destination
+ * VM folder, datastore, resource pool, and BIOS UUID.
+ *
+ * Author: VMware, Inc.
+ * Sample Prerequisites:
+ * The sample needs a source VM and VM name to instant clone as.
+ */
+public class InstantCloneVM extends SamplesAbstractBase {
+    private String sourceVm;
+    private String vmFolder;
+    private String vmName;
+    private String datastore;
+    private String resourcePool;
+    private String biosUuid;
+    private VM vmService;
+    private String resultVMId;
+
+    /**
+     * Define the options specific to this sample and configure the sample using
+     * command-line arguments or a config file
+     *
+     * @param args command line arguments passed to the sample
+     */
+    protected void parseArgs(String[] args) {
+        Option sourceVmOption = Option.builder()
+            .longOpt("sourcevm")
+            .desc("The VM id of the VM to clone from.")
+            .argName("SOURCEVM")
+            .required(true)
+            .hasArg()
+            .build();
+        Option vmNameOption = Option.builder()
+            .longOpt("vmname")
+            .desc("The name of the vm to be created.")
+            .argName("VMNAME")
+            .required(true)
+            .hasArg()
+            .build();
+        Option vmFolderOption = Option.builder()
+            .longOpt("vmfolder")
+            .desc("OPTIONAL: The ID of the vm folder in which to clone the vm to.")
+            .argName("VM FOLDER")
+            .required(false)
+            .hasArg()
+            .build();
+        Option datastoreOption = Option.builder()
+            .longOpt("datastore")
+            .desc("OPTIONAL: The ID of the datastore in which to clone the vm to")
+            .required(false)
+            .argName("DATASTORE")
+            .hasArg()
+            .build();
+        Option resourcePoolOption = Option.builder()
+            .longOpt("resourcepool")
+            .desc("OPTIONAL: The ID of the resource pool in which to clone the vm to.")
+            .argName("RESOURCE POOL")
+            .required(false)
+            .hasArg()
+            .build();
+        Option biosUuidOption = Option.builder()
+            .longOpt("biosuuid")
+            .desc("OPTIONAL: 128-bit SMBIOS UUID of a virtual machine.")
+            .argName("BIOS UUID")
+            .required(false)
+            .hasArg()
+            .build();
+        List<Option> optionList = Arrays.asList(sourceVmOption,
+            vmNameOption,
+            vmFolderOption,
+            datastoreOption,
+            resourcePoolOption,
+            biosUuidOption);
+
+        super.parseArgs(optionList, args);
+        this.sourceVm = (String) parsedOptions.get("sourcevm");
+        this.vmFolder = (String) parsedOptions.get("vmfolder");
+        this.vmName = (String) parsedOptions.get("vmname");
+        this.datastore = (String) parsedOptions.get("datastore");
+        this.resourcePool = (String) parsedOptions.get("resourcepool");
+        this.biosUuid = (String) parsedOptions.get("biosuuid");
+    }
+
+    protected void setup() throws Exception {
+        this.vmService = vapiAuthHelper.getStubFactory().createStub(VM.class,
+            sessionStubConfig);
+    }
+
+    protected void run() throws Exception {
+        // Get a placement spec
+        VMTypes.InstantClonePlacementSpec vmInstantClonePlacementSpec =
+            new VMTypes.InstantClonePlacementSpec();
+        if (this.vmFolder != null) {
+            vmInstantClonePlacementSpec.setFolder(this.vmFolder);
+        }
+        if (this.resourcePool != null) {
+            vmInstantClonePlacementSpec.setResourcePool(this.resourcePool);
+        }
+        if (this.datastore != null) {
+            vmInstantClonePlacementSpec.setDatastore(this.datastore);
+        }
+        // Perform a clone.
+        instantCloneVM(vmInstantClonePlacementSpec);
+    }
+
+    /*
+     * Settings of clone operation.
+     */
+    private void instantCloneVM(
+        VMTypes.InstantClonePlacementSpec vmInstantClonePlacementSpec) {
+        VMTypes.InstantCloneSpec.Builder builder =
+            new VMTypes.InstantCloneSpec.Builder(
+                this.sourceVm, this.vmName).
+            setPlacement(vmInstantClonePlacementSpec);
+        if (this.biosUuid != null) {
+            builder.setBiosUuid(this.biosUuid);
+        }
+        VMTypes.InstantCloneSpec instantCloneSpec = builder.build();
+
+        System.out.println("\n\n#### Example: Instant Clone VM with spec:\n"
+                           + instantCloneSpec);
+        this.resultVMId = vmService.instantClone(instantCloneSpec);
+        VMTypes.Info vmInfo = vmService.get(this.resultVMId);
+        System.out.println("\nVM Info:\n" + vmInfo);
+    }
+
+    protected void cleanup() throws Exception {
+        if (this.resultVMId != null) {
+            System.out.println("\n\n#### Deleting the resulting VM");
+            this.vmService.delete(this.resultVMId);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        /*
+         * Execute the sample using the command line arguments or parameters
+         * from the configuration file. This executes the following steps:
+         * 1. Parse the arguments required by the sample
+         * 2. Login to the server
+         * 3. Setup any resources required by the sample run
+         * 4. Run the sample
+         * 5. Cleanup any data created by the sample run, if cleanup=true
+         * 6. Logout of the server
+         */
+        new InstantCloneVM().execute(args);
+    }
+}
diff --git a/src/main/java/vmware/samples/vcenter/vm/list/README.md b/src/main/java/vmware/samples/vcenter/vm/list/README.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/main/java/vmware/samples/vcenter/vm/registration/RegisterVM.java b/src/main/java/vmware/samples/vcenter/vm/registration/RegisterVM.java
new file mode 100644
index 00000000000..d0ebd59057a
--- /dev/null
+++ b/src/main/java/vmware/samples/vcenter/vm/registration/RegisterVM.java
@@ -0,0 +1,225 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+package vmware.samples.vcenter.vm.registration;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.cli.Option;
+
+import com.vmware.vcenter.VM;
+import com.vmware.vcenter.VMTypes;
+import com.vmware.vcenter.VMTypes.RegisterSpec;
+import com.vmware.vcenter.VMTypes.RegisterPlacementSpec;
+
+import vmware.samples.common.SamplesAbstractBase;
+
+/**
+ * Description: Demonstrates how to register a VM with destination
+ * VM folder, datastore with path, host, cluster, and resource pool.
+ *
+ * Author: VMware, Inc.
+ * Sample Prerequisites:
+ * The sample needs the following resources:
+ * - vm folder
+ * - datastore ID and relative path, or complete datastore path
+ * - At least one of host, resource pool, or cluster
+ */
+public class RegisterVM extends SamplesAbstractBase {
+    private String datastore;
+    private String path;
+    private String datastorePath;
+    private String vmFolder;
+    private String vmName;
+    private String cluster;
+    private String resourcePool;
+    private String host;
+    private VM vmService;
+    private String resultVMId;
+
+    /**
+     * Define the options specific to this sample and configure the sample using
+     * command-line arguments or a config file
+     *
+     * @param args command line arguments passed to the sample
+     */
+    protected void parseArgs(String[] args) {
+        Option datastoreOption = Option.builder()
+            .longOpt("datastore")
+            .desc("OPTIONAL: The datastore ID where the VM is located.\n" +
+                  "If set, path must also be set. If unset datastorePath must" +
+                  " be set.")
+            .argName("DATASTORE")
+            .required(false)
+            .hasArg()
+            .build();
+        Option pathOption = Option.builder()
+            .longOpt("path")
+            .desc("OPTIONAL: The path on the datastore where the VM is " +
+                  "located.\n" +
+                  "If set, datastore must also be set. If unset " +
+                  "datastorePath must be set.")
+            .argName("PATH")
+            .required(false)
+            .hasArg()
+            .build();
+        Option datastorePathOption = Option.builder()
+            .longOpt("datastorePath")
+            .desc("OPTIONAL: The datastore and path where the VM is " +
+                  "located.\n" +
+                  "If set, datastore and path must be unset.")
+            .argName("DATASTOREPATH")
+            .required(false)
+            .hasArg()
+            .build();
+          Option vmNameOption = Option.builder()
+            .longOpt("vmname")
+            .desc("OPTIONAL: The name of the vm to be created.")
+            .argName("VMNAME")
+            .required(false)
+            .hasArg()
+            .build();
+        Option vmFolderOption = Option.builder()
+            .longOpt("vmfolder")
+            .desc("The ID of the vm folder in which to register the vm to.")
+            .argName("VM FOLDER")
+            .required(true)
+            .hasArg()
+            .build();
+        Option clusterOption = Option.builder()
+            .longOpt("cluster")
+            .desc("OPTIONAL: The ID of the cluster in which to register the " +
+                  "vm to. One of cluster, resourcePool or host must be set.")
+            .argName("CLUSTER")
+            .required(false)
+            .hasArg()
+            .build();
+        Option resourcePoolOption = Option.builder()
+            .longOpt("resourcePool")
+            .desc("OPTIONAL: The ID of the resource pool in which to " +
+                  "register the vm to. One of cluster, resourcePool or host " +
+                  "must be set.")
+            .argName("RESOURCE POOL")
+            .required(false)
+            .hasArg()
+            .build();
+        Option hostOption = Option.builder()
+            .longOpt("host")
+            .desc("OPTIONAL: The ID of the host in which to register the " +
+                  "vm to. One of cluster, resourcePool or host must be set.")
+            .argName("HOST")
+            .required(false)
+            .hasArg()
+            .build();
+        List<Option> optionList = Arrays.asList(datastoreOption,
+            pathOption,
+            datastorePathOption,
+            vmNameOption,
+            vmFolderOption,
+            clusterOption,
+            resourcePoolOption,
+            hostOption);
+
+        super.parseArgs(optionList, args);
+        this.datastore = (String) parsedOptions.get("datastore");
+        this.path = (String) parsedOptions.get("path");
+        this.datastorePath = (String) parsedOptions.get("datastorePath");
+        this.vmFolder = (String) parsedOptions.get("vmfolder");
+        this.vmName = (String) parsedOptions.get("vmname");
+        this.cluster = (String) parsedOptions.get("cluster");
+        this.resourcePool = (String) parsedOptions.get("resourcePool");
+        this.host = (String) parsedOptions.get("host");
+    }
+
+    protected void setup() throws Exception {
+        this.vmService = vapiAuthHelper.getStubFactory().createStub(VM.class,
+            sessionStubConfig);
+    }
+
+    protected void run() throws Exception {
+        // Basic parameter validation.
+        if ((this.datastore != null && this.path != null &&
+             this.datastorePath != null) ||
+            (this.datastore == null && this.path == null &&
+             this.datastorePath == null)) {
+            throw new Exception("Either datastore with path or datastorePath " +
+                                "must be set but not both");
+        }
+        if (this.host == null && this.cluster == null &&
+            this.resourcePool == null) {
+            throw new Exception("At least one of host, cluster or " +
+                                "resourcePool must be set");
+        }
+
+        // Get a placement spec
+        RegisterPlacementSpec vmRegisterPlacementSpec =
+            new RegisterPlacementSpec();
+        vmRegisterPlacementSpec.setFolder(this.vmFolder);
+        if (this.cluster != null) {
+            vmRegisterPlacementSpec.setCluster(this.cluster);
+        }
+        if (this.resourcePool != null) {
+            vmRegisterPlacementSpec.setResourcePool(this.resourcePool);
+        }
+        if (this.host != null) {
+            vmRegisterPlacementSpec.setHost(this.host);
+        }
+        // Perform a VM register.
+        registerVM(vmRegisterPlacementSpec);
+    }
+
+    /*
+     * Settings of register operation.
+     */
+    private void registerVM(
+        RegisterPlacementSpec vmRegisterPlacementSpec) {
+        RegisterSpec.Builder specBuilder =
+            new RegisterSpec.Builder().setPlacement(
+                vmRegisterPlacementSpec);
+
+       if (this.datastorePath != null) {
+            specBuilder.setDatastorePath(this.datastorePath);
+        } else {
+            specBuilder.setDatastore(this.datastore);
+            specBuilder.setPath(this.path);
+        }
+
+        RegisterSpec vmRegisterSpec = specBuilder.build();
+        System.out.println("\n\n#### Example: Register VM with spec:\n"
+                           + vmRegisterSpec);
+        this.resultVMId = vmService.register(vmRegisterSpec);
+        VMTypes.Info vmInfo = vmService.get(this.resultVMId);
+        System.out.println("\nVM Info:\n" + vmInfo);
+    }
+
+    protected void cleanup() throws Exception {
+        if (this.resultVMId != null) {
+            System.out.println("\n\n#### Unregistering the resulting VM");
+            this.vmService.unregister(this.resultVMId);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        /*
+         * Execute the sample using the command line arguments or parameters
+         * from the configuration file. This executes the following steps:
+         * 1. Parse the arguments required by the sample
+         * 2. Login to the server
+         * 3. Setup any resources required by the sample run
+         * 4. Run the sample
+         * 5. Cleanup any data created by the sample run, if cleanup=true
+         * 6. Logout of the server
+         */
+        new RegisterVM().execute(args);
+    }
+}
diff --git a/src/main/java/vmware/samples/vcenter/vm/registration/UnregisterVM.java b/src/main/java/vmware/samples/vcenter/vm/registration/UnregisterVM.java
new file mode 100644
index 00000000000..a037f995aa2
--- /dev/null
+++ b/src/main/java/vmware/samples/vcenter/vm/registration/UnregisterVM.java
@@ -0,0 +1,81 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+package vmware.samples.vcenter.vm.registration;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.cli.Option;
+
+import com.vmware.vcenter.VM;
+
+import vmware.samples.common.SamplesAbstractBase;
+
+/**
+ * Description: Demonstrates how to unregister a VM by id.
+ *
+ * Author: VMware, Inc.
+ * Sample Prerequisites:
+ * The sample needs a VM id.
+ */
+public class UnregisterVM extends SamplesAbstractBase {
+    private VM vmService;
+    private String vmId;
+
+    /**
+     * Define the options specific to this sample and configure the sample using
+     * command-line arguments or a config file
+     *
+     * @param args command line arguments passed to the sample
+     */
+    protected void parseArgs(String[] args) {
+        Option vmIdOption = Option.builder()
+            .longOpt("vmId")
+            .desc("The VM ID to unregister.")
+            .argName("VMID")
+            .required(true)
+            .hasArg()
+            .build();
+        List<Option> optionList = Arrays.asList(vmIdOption);
+
+        super.parseArgs(optionList, args);
+        this.vmId = (String) parsedOptions.get("vmId");
+    }
+
+    protected void setup() throws Exception {
+        this.vmService = vapiAuthHelper.getStubFactory().createStub(VM.class,
+            sessionStubConfig);
+    }
+
+    protected void run() throws Exception {
+        System.out.println("\n\n#### Example: Unregister VM: " + vmId);
+        vmService.unregister(vmId);
+    }
+
+    protected void cleanup() throws Exception {
+    }
+
+    public static void main(String[] args) throws Exception {
+        /*
+         * Execute the sample using the command line arguments or parameters
+         * from the configuration file. This executes the following steps:
+         * 1. Parse the arguments required by the sample
+         * 2. Login to the server
+         * 3. Setup any resources required by the sample run
+         * 4. Run the sample
+         * 5. Cleanup any data created by the sample run, if cleanup=true
+         * 6. Logout of the server
+         */
+        new UnregisterVM().execute(args);
+    }
+}
diff --git a/src/main/java/vmware/samples/vcenter/vm/relocate/RelocateVM.java b/src/main/java/vmware/samples/vcenter/vm/relocate/RelocateVM.java
new file mode 100644
index 00000000000..fdd02895a9d
--- /dev/null
+++ b/src/main/java/vmware/samples/vcenter/vm/relocate/RelocateVM.java
@@ -0,0 +1,195 @@
+/*
+ * *******************************************************
+ * Copyright VMware, Inc. 2019.  All Rights Reserved.
+ * SPDX-License-Identifier: MIT
+ * *******************************************************
+ *
+ * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
+ * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
+ * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
+ * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+package vmware.samples.vcenter.vm.relocate;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import org.apache.commons.cli.Option;
+
+import com.vmware.vcenter.VM;
+import com.vmware.vcenter.VMTypes;
+import com.vmware.vcenter.VMTypes.DiskRelocateSpec;
+
+import vmware.samples.common.SamplesAbstractBase;
+
+/**
+ * Description: Demonstrates how to relocate a VM with optional destination
+ * VM folder, datastore, host, cluster, resource pool, disk datastore.
+ *
+ * Author: VMware, Inc.
+ * Sample Prerequisites:
+ * The sample needs a source VM to relocate from.
+ */
+public class RelocateVM extends SamplesAbstractBase {
+    private String vm;
+    private String vmFolder;
+    private String datastore;
+    private String cluster;
+    private String resourcePool;
+    private String host;
+    private String disk;
+    private VM vmService;
+
+    /**
+     * Define the options specific to this sample and configure the sample using
+     * command-line arguments or a config file
+     *
+     * @param args command line arguments passed to the sample
+     */
+    protected void parseArgs(String[] args) {
+        Option vmOption = Option.builder()
+            .longOpt("vm")
+            .desc("The VM id of the VM to relocate.")
+            .argName("VM")
+            .required(true)
+            .hasArg()
+            .build();
+        Option vmFolderOption = Option.builder()
+            .longOpt("vmfolder")
+            .desc("OPTIONAL: The ID of the vm folder in which to relocate the vm to.")
+            .argName("VM FOLDER")
+            .required(false)
+            .hasArg()
+            .build();
+        Option datastoreOption = Option.builder()
+            .longOpt("datastore")
+            .desc("OPTIONAL: The ID of the datastore in which to relocate the vm to")
+            .required(false)
+            .argName("DATASTORE")
+            .hasArg()
+            .build();
+        Option clusterOption = Option.builder()
+            .longOpt("cluster")
+            .desc("OPTIONAL: The ID of the cluster in which to relocate the vm to.")
+            .argName("CLUSTER")
+            .required(false)
+            .hasArg()
+            .build();
+        Option resourcePoolOption = Option.builder()
+            .longOpt("resourcepool")
+            .desc("OPTIONAL: The ID of the resource pool in which to relocate the vm to.")
+            .argName("RESOURCE POOL")
+            .required(false)
+            .hasArg()
+            .build();
+        Option hostOption = Option.builder()
+            .longOpt("host")
+            .desc("OPTIONAL: The ID of the host in which to relocate the vm to.")
+            .argName("HOST")
+            .required(false)
+            .hasArg()
+            .build();
+        Option diskUpdateOption = Option.builder()
+            .longOpt("disk")
+            .desc("OPTIONAL: Comma separated disk-ID:datastore-ID map.")
+            .argName("DISK")
+            .required(false)
+            .hasArg()
+            .build();
+
+        List<Option> optionList = Arrays.asList(vmOption,
+            vmFolderOption,
+            datastoreOption,
+            clusterOption,
+            resourcePoolOption,
+            hostOption,
+            diskUpdateOption);
+
+        super.parseArgs(optionList, args);
+        this.vm = (String) parsedOptions.get("vm");
+        this.vmFolder = (String) parsedOptions.get("vmfolder");
+        this.datastore = (String) parsedOptions.get("datastore");
+        this.cluster = (String) parsedOptions.get("cluster");
+        this.resourcePool = (String) parsedOptions.get("resourcepool");
+        this.host = (String) parsedOptions.get("host");
+        this.disk = (String) parsedOptions.get("disk");
+    }
+
+    protected void setup() throws Exception {
+        this.vmService = vapiAuthHelper.getStubFactory().createStub(VM.class,
+            sessionStubConfig);
+    }
+
+    protected void run() throws Exception {
+        // Get a placement spec
+        VMTypes.RelocatePlacementSpec vmRelocatePlacementSpec =
+            new VMTypes.RelocatePlacementSpec();
+        if (this.vmFolder != null) {
+            vmRelocatePlacementSpec.setFolder(this.vmFolder);
+        }
+        if (this.cluster != null) {
+            vmRelocatePlacementSpec.setCluster(this.cluster);
+        }
+        if (this.resourcePool != null) {
+            vmRelocatePlacementSpec.setResourcePool(this.resourcePool);
+        }
+        if (this.host != null) {
+            vmRelocatePlacementSpec.setHost(this.host);
+        }
+        if (this.datastore != null) {
+            vmRelocatePlacementSpec.setDatastore(this.datastore);
+        }
+        // Perform a relocate.
+        relocateVM(vmRelocatePlacementSpec);
+    }
+
+    /*
+     * Settings of relocate operation.
+     */
+    private void relocateVM(
+        VMTypes.RelocatePlacementSpec vmRelocatePlacementSpec) {
+        VMTypes.RelocateSpec.Builder specBuilder =
+            new VMTypes.RelocateSpec.Builder().
+            setPlacement(vmRelocatePlacementSpec);
+
+        // Handle mapping of cloning individual disks to other datastores.
+        if (this.disk != null) {
+            Map<String, DiskRelocateSpec> diskMap =
+                new HashMap<String, DiskRelocateSpec>();
+            StringTokenizer tokenizer = new StringTokenizer(this.disk, ",");
+            while (tokenizer.hasMoreTokens()) {
+                String[] keyValue = tokenizer.nextToken().split(":", 2);
+                DiskRelocateSpec spec = new DiskRelocateSpec.Builder().
+                    setDatastore(keyValue[1]).build();
+                diskMap.put(keyValue[0], spec);
+            }
+            specBuilder.setDisks(diskMap);
+        }
+
+        VMTypes.RelocateSpec vmRelocateSpec = specBuilder.build();
+        System.out.println("\n\n#### Example: Relocate VM with spec:\n"
+                           + vmRelocateSpec);
+        vmService.relocate(this.vm, vmRelocateSpec);
+    }
+
+    protected void cleanup() throws Exception {
+    }
+
+    public static void main(String[] args) throws Exception {
+        /*
+         * Execute the sample using the command line arguments or parameters
+         * from the configuration file. This executes the following steps:
+         * 1. Parse the arguments required by the sample
+         * 2. Login to the server
+         * 3. Setup any resources required by the sample run
+         * 4. Run the sample
+         * 5. Cleanup any data created by the sample run, if cleanup=true
+         * 6. Logout of the server
+         */
+        new RelocateVM().execute(args);
+    }
+}
diff --git a/src/main/java/vmware/samples/vcenter/vstats/README.md b/src/main/java/vmware/samples/vcenter/vstats/README.md
index ec0740530a2..1dcde352cd4 100644
--- a/src/main/java/vmware/samples/vcenter/vstats/README.md
+++ b/src/main/java/vmware/samples/vcenter/vstats/README.md
@@ -1,12 +1,12 @@
-This directory contains samples for managing vSphere Stats platform and querying for stats data:
+This directory contains samples for managing vSphere stats platform and querying for stats data:
 
-### vStats Discovery APIs - List Counters, List Counter Metadata, Get Resource Address Schema, List Providers, List Resource types, List Metrics, List Counter-sets
+### vStats Discovery APIs - List Counters, List Counter Metadata, Get Resource Address Schema, List Providers, List Resource types, List metrics, List Counter-sets
 Sample                                                                      | Description
 ----------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------
 vmware.samples.vcenter.vstats.list.Discovery.java                           | Demonstrates all vStats discovery APIs which give current state of the system.
 
 
-### vStats Acquisition Specification Create/Get/List/Delete/Update operations
+### vStats Acquisition Specification Create/List/Delete/Update operations
 Sample                                                                      | Description
 ----------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------
 vmware.samples.vcenter.vstats.acqspecs.LifeCycle.java                       | Demonstrates create, get, list, update and delete operations of Acquisition Specifications.
@@ -16,11 +16,11 @@ vmware.samples.vcenter.vstats.acqspecs.LifeCycle.java                       | De
 Sample                                                                      | Description
 ----------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------
 vmware.samples.vcenter.vstats.data.QueryDataPoints.java                     | Demonstrates creation of Acquisition Specification and query for data points filtered by cid.
-vmware.samples.vcenter.vstats.data.QueryDataPointsWithPredicate.java        | Demonstrates creation of Acquisition Specification using QueryPredicate "ALL" and query for data points filtered by cid.
-vmware.samples.vcenter.vstats.data.QueryDataPointsWithSetID.java            | Demonstrates creation of Acquisition Specification using Counter SetId and query for data points filtered by resource.
+vmware.samples.vcenter.vstats.data.QueryDataPointsWithPredicate.java        | Demonstrates creation of Acquisition Specification using Counter SetId and query for data points filtered by cid.
+vmware.samples.vcenter.vstats.data.QueryDataPointsWithSetID.java            | Demonstrates creation of Acquisition Specification using QueryPredicate "ALL" and query for data points filtered by resource.
 
 
 ### Testbed Requirement:
     - 1 vCenter Server on version 7.0x or higher
     - 2 ESXi hosts on version 7.0x or higher with VMs
-    - 1 datastore
+    - 1 datastore
\ No newline at end of file
diff --git a/src/main/java/vmware/samples/vcenter/vstats/acqspecs/LifeCycle.java b/src/main/java/vmware/samples/vcenter/vstats/acqspecs/LifeCycle.java
index 430dbcd8a00..c8af89ff9b5 100644
--- a/src/main/java/vmware/samples/vcenter/vstats/acqspecs/LifeCycle.java
+++ b/src/main/java/vmware/samples/vcenter/vstats/acqspecs/LifeCycle.java
@@ -112,7 +112,7 @@ protected void run() throws Exception {
 		List<Summary> providersList = providerService.list();
 		Random rand = new Random();
 		String hostIdValue = providersList
-				.get(rand.nextInt(providersList.size())).getIdValue();
+				.get(rand.nextInt(providersList.size())).getId();
 		RsrcId hostRsrcId = new RsrcId();
 		hostRsrcId.setIdValue(hostIdValue);
 		hostRsrcId.setType(hostType);
diff --git a/src/main/java/vmware/samples/vcenter/vstats/data/QueryDataPointsWithSetID.java b/src/main/java/vmware/samples/vcenter/vstats/data/QueryDataPointsWithSetID.java
index 7bf95b7276d..84fca1e10aa 100644
--- a/src/main/java/vmware/samples/vcenter/vstats/data/QueryDataPointsWithSetID.java
+++ b/src/main/java/vmware/samples/vcenter/vstats/data/QueryDataPointsWithSetID.java
@@ -107,8 +107,7 @@ protected void run() throws Exception {
 		CounterSpec counterSpec = new CounterSpec();
 		List<RsrcId> resourceSpec = new ArrayList<RsrcId>();
 
-		// Get Counter-set ID of VM counters which is provided as Acquisition
-                // Specification setId.
+		// Get Counter-set ID of VM counters which is provided as setId.
 		List<CounterSetsTypes.Info> counterSets = counterSetsService.list();
 		String[] parts;
 		String setId = null;
diff --git a/src/main/java/vmware/samples/vmc/README.md b/src/main/java/vmware/samples/vmc/README.md
index ff185e0c373..c349ee1a415 100644
--- a/src/main/java/vmware/samples/vmc/README.md
+++ b/src/main/java/vmware/samples/vmc/README.md
@@ -4,8 +4,8 @@ The following table shows the sample sub-directories and their contents.
 
 Directory       | Description
 ----------------| -------------
-draas           | Samples for VMware Cloud Site Recovery (DRaaS) APIs
+draas           | Samples for DRaaS APIs
 helpers         | Helper methods used by VMware Cloud on AWS API samples
 networks        | Samples for networking APIs
 orgs            | Samples for operations on organizations
-sddc            | Samples for operations on SDDCs
\ No newline at end of file
+sddc            | Samples for operations on SDDCs
diff --git a/src/main/java/vmware/samples/vmc/custom/VMCCustomerOps.java b/src/main/java/vmware/samples/vmc/custom/VMCCustomerOps.java
new file mode 100644
index 00000000000..1f883d4c662
--- /dev/null
+++ b/src/main/java/vmware/samples/vmc/custom/VMCCustomerOps.java
@@ -0,0 +1,82 @@
+package vmware.samples.vmc.custom;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.cli.Option;
+
+import com.vmware.vapi.client.ApiClient;
+//import com.vmware.vmc.orgs.AccountLink;
+import com.vmware.vmc.orgs.account_link.ConnectedAccounts;
+//import com.vmware.vmc.orgs.account_link.SddcConnections;
+
+import vmware.samples.common.VmcSamplesAbstractBase;
+import vmware.samples.common.authentication.VmcAuthenticationHelper;
+
+public class VMCCustomerOps extends VmcSamplesAbstractBase {
+    private ConnectedAccounts connectedAccounts;    
+    private ApiClient apiClient;
+   // private SddcConnections sddcConnections;
+    private String orgId, sddcName/*, sddcId*/;
+
+
+	@Override
+	protected void parseArgs(String[] args) {
+        Option orgOption = Option.builder()
+                .longOpt("org_id")
+                .desc("Specify the organization id")
+                .argName("ORGANIZATION ID")
+                .required(true)
+                .hasArg()
+                .build();
+        Option sddcOption = Option.builder()
+                .longOpt("sddc_name")
+                .desc("Specify the name of the sddc to be created")
+                .argName("SDDC NAME")
+                .required(true)
+                .hasArg()
+                .build();    
+        List<Option> optionList = Arrays.asList(orgOption, sddcOption);
+
+        super.parseArgs(optionList, args);
+        this.orgId = (String) parsedOptions.get("org_id");
+        this.sddcName = (String) parsedOptions.get("sddc_name");
+	}
+
+	@Override
+	protected void setup() throws Exception {
+        this.vmcAuthHelper = new VmcAuthenticationHelper();
+        this.apiClient = this.vmcAuthHelper.newVmcClient(this.vmcServer, this.cspServer, this.refreshToken);
+        this.connectedAccounts = apiClient.createStub(ConnectedAccounts.class);
+        //this.sddcConnections = apiClient.createStub(SddcConnections.class);
+	}
+
+	@Override
+	protected void run() throws Exception {
+		// TODO Auto-generated method stub
+		//System.out.println("Hello");
+		//AccountLink accountLink = apiClient.createStub(AccountLink.class);
+	    //accountLink.get(orgId);
+
+		//connectedAccounts.get(orgId, "AWS");
+		//sddcConnections.get(orgId, sddcId);
+		System.out.println(connectedAccounts.get(orgId, null));
+		//System.out.println(sddcConnections.get(orgId, sddcId));
+		System.out.println(sddcName);
+
+	}
+
+	@Override
+	protected void cleanup() throws Exception {
+		// TODO Auto-generated method stub
+
+	}
+
+	public static void main(String[] args) throws Exception {
+		// TODO Auto-generated method stub
+        new VMCCustomerOps().execute(args);
+
+
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/vmware/samples/vmc/draas/ActivationOperations.java b/src/main/java/vmware/samples/vmc/draas/ActivationOperations.java
index a04ee4db9c5..241ee0db309 100644
--- a/src/main/java/vmware/samples/vmc/draas/ActivationOperations.java
+++ b/src/main/java/vmware/samples/vmc/draas/ActivationOperations.java
@@ -78,7 +78,7 @@ protected void run() throws Exception {
 				siteRecoveryStub.post(orgId, sddcId, null);
 		System.out.printf("Site Recovery Addon Task Activation ID  %s", siteRecoveryActivationTask.getId(),
 				"\t", siteRecoveryActivationTask.getStatus());
-        boolean taskCompleted = DraasTaskHelper.pollTask(apiClient, orgId, siteRecoveryActivationTask.getId(), 
+        boolean taskCompleted = DraasTaskHelper.pollTask(apiClient, orgId, siteRecoveryActivationTask.getId(),
                 TASK_POLLING_DELAY_IN_MILLISECONDS);
         if(!taskCompleted) {
             System.out.println(" Deploy DraaS task was either canceled or it failed. Exiting.");
diff --git a/src/main/java/vmware/samples/vmc/helpers/EdgeType.java b/src/main/java/vmware/samples/vmc/helpers/EdgeType.java
deleted file mode 100644
index ad194a04b5c..00000000000
--- a/src/main/java/vmware/samples/vmc/helpers/EdgeType.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * *******************************************************
- * Copyright VMware, Inc. 2018.  All Rights Reserved.
- * SPDX-License-Identifier: MIT
- * *******************************************************
- *
- * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
- * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
- * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
- * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-package vmware.samples.vmc.helpers;
-
-public enum EdgeType {
-    MANAGEMENT_GATEWAY,
-    COMPUTE_GATEWAY
-}
diff --git a/src/main/java/vmware/samples/vmc/helpers/FirewallConfigHelper.java b/src/main/java/vmware/samples/vmc/helpers/FirewallConfigHelper.java
deleted file mode 100644
index bd264ac91cd..00000000000
--- a/src/main/java/vmware/samples/vmc/helpers/FirewallConfigHelper.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * *******************************************************
- * Copyright VMware, Inc. 2018.  All Rights Reserved.
- * SPDX-License-Identifier: MIT
- * *******************************************************
- *
- * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
- * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
- * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
- * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-package vmware.samples.vmc.helpers;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.vmware.vapi.client.ApiClient;
-import com.vmware.vmc.model.AddressFWSourceDestination;
-import com.vmware.vmc.model.EdgeSummary;
-import com.vmware.vmc.model.FirewallRules;
-import com.vmware.vmc.model.Nsxfirewallrule;
-import com.vmware.vmc.orgs.sddcs.networks.Edges;
-import com.vmware.vmc.orgs.sddcs.networks.edges.firewall.Config;
-import com.vmware.vmc.orgs.sddcs.networks.edges.firewall.config.Rules;
-
-/**
- * Helper class for firewall configuration operations.
- * @author VMware, Inc
- */
-public class FirewallConfigHelper {
-    private String orgId, sddcId;
-    private ApiClient vmcClient;
-    private Rules firewallRulesStub;
-    private Config firewallConfigStub;
-    private Edges edgesStub;
-
-    public FirewallConfigHelper(ApiClient vmcClient, String orgId, String sddcId) {
-        this.vmcClient = vmcClient;
-        this.orgId = orgId;
-        this.sddcId = sddcId;
-        this.firewallConfigStub = this.vmcClient.createStub(Config.class);
-        this.firewallRulesStub = this.vmcClient.createStub(Rules.class);
-        this.edgesStub = vmcClient.createStub(Edges.class);
-    }
-
-    /**
-     * Creates a Firewall Rule which allows any to any traffic.
-     *
-     * @param ruleName name of the Firewall Rule.
-     * @param edgeType type of edge on which the rule should be created.
-     */
-    public void createAnyToAnyFirewallRule(String ruleName, EdgeType edgeType) {
-        // Get the edge id for the edge type
-        String edgeId = getEdgeId(edgeType);
-
-        // Create the firewall rule configuration
-        Nsxfirewallrule firewallRule =
-                new Nsxfirewallrule.Builder()
-                .setRuleType("user")
-                .setName(ruleName)
-                .setEnabled(true)
-                .setAction("accept")
-                .setSource(
-                        new AddressFWSourceDestination.Builder()
-                        .setExclude(false)
-                        .setIpAddress(Collections.singletonList("any"))
-                        .build())
-                .setDestination(
-                        new AddressFWSourceDestination.Builder()
-                        .setExclude(false)
-                        .setIpAddress(Collections.singletonList("any"))
-                        .build())
-                .setLoggingEnabled(false)
-                .build();
-
-        System.out.printf("\nFirewall Rule Spec:");
-        System.out.printf("%s", firewallRule);
-
-        // Add the Firewall Rule
-        firewallRulesStub.add(this.orgId, this.sddcId, edgeId,
-                  new FirewallRules.Builder()
-                  .setFirewallRules(Collections.singletonList(firewallRule))
-                  .build());
-        System.out.printf("\nNew Firewall Rule \"%s\" has been added", firewallRule.getName());
-    }
-
-    /**
-     * Gets the ruleId of the Firewall Rule with the specified name for the specified edge type.
-     *
-     * @param firewallRuleName Name of the Firewall Rule.
-     * @param edgeType Type of edge on which the rule exists
-     * @return ruleId of the Firewall Rule
-     * @throws Exception if the Firewall Rule with the specified name is not found on the specified edge type.
-     */
-    public Long getFirewallRule(String firewallRuleName, EdgeType edgeType) throws Exception {
-        System.out.printf("\nSearching for the Firewall Rule with name \"%s\" on edge \"%s\"",
-                firewallRuleName, edgeType);
-        String edgeId = getEdgeId(edgeType);
-        FirewallRules rules = this.firewallConfigStub.get(this.orgId, this.sddcId, edgeId).getFirewallRules();
-        List<Nsxfirewallrule> nsxFirewallRulesList = rules.getFirewallRules();
-
-        for(Nsxfirewallrule nsxRule : nsxFirewallRulesList) {
-            if(nsxRule.getName().equals(firewallRuleName)) {
-                System.out.printf("\nFound Firewall Rule with name %s", nsxRule.getName());
-                return nsxRule.getRuleId();
-            }
-        }
-        throw new Exception("Could not find Firewall Rule with name " + firewallRuleName);
-    }
-
-    /**
-     * Deletes the Firewall Rule with the specified name on the specified edge type.
-     *
-     * @param firewallRuleName Name of the Firewall rule to be deleted.
-     * @param edgeType Type of edge on which the rule exists
-     * @throws Exception if the Firewall Rule with the specified name is not found on the specified edge type.
-     */
-    public void deleteFirewallRule(String firewallRuleName, EdgeType edgeType) throws Exception {
-        String edgeId = getEdgeId(edgeType);
-        Long firewallRuleId = getFirewallRule(firewallRuleName, edgeType);
-        this.firewallRulesStub.delete(this.orgId, this.sddcId, edgeId, firewallRuleId);
-        System.out.printf("\nFirewall rule \"%s\" has been deleted", firewallRuleName);
-    }
-
-    private String getEdgeId(EdgeType edgeType) {
-        List<EdgeSummary> edges =
-                this.edgesStub.get(this.orgId, this.sddcId, "gatewayServices",
-                        null, null, null, null, null, null, null).getEdgePage().getData();
-        return edges.get(EdgeType.COMPUTE_GATEWAY.ordinal()).getId();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/vmware/samples/vmc/helpers/NatConfigHelper.java b/src/main/java/vmware/samples/vmc/helpers/NatConfigHelper.java
deleted file mode 100644
index afa4014ce47..00000000000
--- a/src/main/java/vmware/samples/vmc/helpers/NatConfigHelper.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * *******************************************************
- * Copyright VMware, Inc. 2018.  All Rights Reserved.
- * SPDX-License-Identifier: MIT
- * *******************************************************
- *
- * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
- * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
- * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
- * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-package vmware.samples.vmc.helpers;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.vmware.vapi.client.ApiClient;
-import com.vmware.vmc.model.EdgeSummary;
-import com.vmware.vmc.model.NatRules;
-import com.vmware.vmc.model.Nsxnatrule;
-import com.vmware.vmc.orgs.sddcs.networks.Edges;
-import com.vmware.vmc.orgs.sddcs.networks.edges.nat.Config;
-import com.vmware.vmc.orgs.sddcs.networks.edges.nat.config.Rules;
-
-/**
- * Helper class for NAT Rules configuration operations.
- * @author VMware, Inc
- */
-public class NatConfigHelper {
-    private String orgId, sddcId;
-    private ApiClient vmcClient;
-    private Rules natRulesStub;
-    private Config natRulesConfigStub;
-    private Edges edgesStub;
-
-    public NatConfigHelper(ApiClient vmcClient, String orgId, String sddcId) {
-        this.vmcClient = vmcClient;
-        this.orgId = orgId;
-        this.sddcId = sddcId;
-        this.natRulesConfigStub = this.vmcClient.createStub(Config.class);
-        this.natRulesStub = this.vmcClient.createStub(Rules.class);
-        this.edgesStub = vmcClient.createStub(Edges.class);
-    }
-
-    /**
-     * Create a NAT Rule with the specified name on the specified edge type.
-     *
-     * @param natRuleName Name of the NAT Rule.
-     * @param edgeType type of edge (Compute/Management) on which the NAT rule should be created.
-     * @param originalAddress original address for NAT Rule.
-     * @param translatedAddress translated address for the NAT Rule.
-     */
-    public void createNatRule(String natRuleName, EdgeType edgeType, String originalAddress, String translatedAddress) {
-        // Get the edge id for the edge type
-        String edgeId = getEdgeId(edgeType);
-
-        // Add a NAT rule to the edge
-        Nsxnatrule nsxNatRule =
-                new Nsxnatrule.Builder()
-                .setVnic("0")
-                .setRuleType("user")
-                .setAction("dnat")
-                .setProtocol("any")
-                .setDescription(natRuleName)
-                .setOriginalAddress(originalAddress)
-                .setOriginalPort("any")
-                .setTranslatedAddress(translatedAddress)
-                .setTranslatedPort("any")
-                .setEnabled(true)
-                .build();
-        System.out.printf("\nNAT Rule Spec:");
-        System.out.printf("%s", nsxNatRule);
-        this.natRulesStub.add(this.orgId, this.sddcId, edgeId,
-                     new NatRules.Builder()
-                     .setNatRulesDtos(Collections.singletonList(nsxNatRule))
-                     .build());
-        System.out.printf("\nNew NAT Rule with description \"%s\" added to %s",
-                nsxNatRule.getDescription(), edgeType);
-    }
-
-    /**
-     * Gets the ruleId of the NAT Rule with the specified name for the specified edge type.
-     *
-     * @param natRuleName Name of the NAT Rule.
-     * @param edgeType Type of edge on which the rule exists
-     * @return ruleId of the NAT Rule
-     * @throws Exception if the NAT Rule with the specified name is not found on the specified edge type.
-     */
-    public Long getNatRule(String natRuleName, EdgeType edgeType) throws Exception {
-        String edgeId = getEdgeId(edgeType);
-        List<Nsxnatrule> natRules =
-                this.natRulesConfigStub.get(this.orgId, this.sddcId, edgeId)
-                .getRules()
-                .getNatRulesDtos();
-        System.out.printf("\nSearching for the NAT Rule with name \"%s\" on edge \"%s\"",
-                natRuleName, edgeType);
-        for(Nsxnatrule rule : natRules) {
-            if(rule.getDescription().equals(natRuleName)) {
-                System.out.printf("\nFound NAT Rule with description %s", rule.getDescription());
-                return rule.getRuleId();
-            }
-        }
-
-        for(Nsxnatrule rule : natRules) {
-            if(rule.getDescription().equals(natRuleName)) {
-                System.out.printf("\nFound NAT Rule with description %s", rule.getDescription());
-                return rule.getRuleId();
-            }
-        }
-        throw new Exception("Could not find Firewall Rule with description " + natRuleName);
-    }
-
-    /**
-     * Deletes the NAT rule with the specified name on the specified edge type.
-     *
-     * @param natRuleName Name of the NAT rule to be deleted.
-     * @param edgeType Type of edge on which the rule exists
-     * @throws Exception if a NAT rule with matching description is not found on the specified edge
-     */
-    public void deleteNatRule(String natRuleName, EdgeType edgeType) throws Exception {
-        String edgeId = getEdgeId(edgeType);
-        Long natRuleId = getNatRule(natRuleName, EdgeType.COMPUTE_GATEWAY);
-        this.natRulesStub.delete(this.orgId, this.sddcId, edgeId, natRuleId);
-        System.out.printf("\nNAT rule \"%s\" has been deleted", natRuleName);
-    }
-
-    private String getEdgeId(EdgeType edgeType) {
-        List<EdgeSummary> edges =
-                this.edgesStub.get(this.orgId, this.sddcId, "gatewayServices", null, null, null, null, null, null, null)
-                  .getEdgePage().getData();
-        return edges.get(EdgeType.COMPUTE_GATEWAY.ordinal()).getId();
-    }
-}
diff --git a/src/main/java/vmware/samples/vmc/networks/ExposeVMPublicIP.java b/src/main/java/vmware/samples/vmc/networks/ExposeVMPublicIP.java
deleted file mode 100644
index 630d184ef30..00000000000
--- a/src/main/java/vmware/samples/vmc/networks/ExposeVMPublicIP.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * *******************************************************
- * Copyright VMware, Inc. 2018.  All Rights Reserved.
- * SPDX-License-Identifier: MIT
- * *******************************************************
- *
- * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
- * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
- * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
- * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-package vmware.samples.vmc.networks;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.commons.cli.Option;
-
-import com.vmware.vapi.client.ApiClient;
-import com.vmware.vmc.model.SddcAllocatePublicIpSpec;
-import com.vmware.vmc.model.SddcPublicIp;
-import com.vmware.vmc.model.Task;
-import com.vmware.vmc.orgs.sddcs.Publicips;
-
-import vmware.samples.common.VmcSamplesAbstractBase;
-import vmware.samples.common.authentication.VmcAuthenticationHelper;
-import vmware.samples.vmc.helpers.EdgeType;
-import vmware.samples.vmc.helpers.FirewallConfigHelper;
-import vmware.samples.vmc.helpers.NatConfigHelper;
-import vmware.samples.vmc.helpers.VmcTaskHelper;
-
-/**
- * Description: Demonstrates how to expose a SDDC VM to the public internet
- *
- * Demo steps required to expose a VM to public internet
- * 1. Request a public IP address
- * 2. Add a Firewall Rule on Compute Gateway to access the VM
- * 3. Create a NAT rule to forward traffic from public IP to private IP
- *
- * Sample Prerequisites:
- * A VM deployed inside the SDDC with a private IP address
- *
- * Author: VMware, Inc.
- */
-public class ExposeVMPublicIP extends VmcSamplesAbstractBase {
-    private ApiClient vmcClient;
-    private Publicips publicIpsStub;
-    private FirewallConfigHelper firewallConfigHelper;
-    private NatConfigHelper natConfigHelper;
-    private String orgId, sddcId, internalIp, ipId, publicIp;
-    private static final int TASK_POLLING_DELAY_IN_MILLISECONDS = 500;
-    private static final String PUBLIC_IP_NOTES = "Sample-Public-IP-java";
-    private static final String DEFAULT_NAT_RULE_DESCRIPTION = "Sample NAT Rule - Java";
-    private static final String DEFAULT_FIREWALL_RULE_NAME = "Sample Firewall Rule - Java";
-
-    /**
-     * Define the options specific to this sample and configure the sample using
-     * command-line arguments or a config file
-     *
-     * @param args command line arguments passed to the sample
-     */
-    protected void parseArgs(String[] args) {
-        Option orgOption = Option.builder()
-                .longOpt("org_id")
-                .desc("Specify the organization id")
-                .argName("ORGANIZATION ID")
-                .required(true)
-                .hasArg()
-                .build();
-        Option sddcOption = Option.builder()
-                .longOpt("sddc_id")
-                .desc("Specify the SDDC id")
-                .argName("SDDC ID")
-                .required(true)
-                .hasArg()
-                .build();
-        Option internalIpOption = Option.builder()
-                .longOpt("internal_ip")
-                .desc("Private IP of the VM")
-                .argName("SDDC ID")
-                .required(true)
-                .hasArg()
-                .build();
-        List<Option> optionList = Arrays.asList(orgOption, sddcOption, internalIpOption);
-
-        super.parseArgs(optionList, args);
-        this.orgId = (String) parsedOptions.get("org_id");
-        this.sddcId = (String) parsedOptions.get("sddc_id");
-        this.internalIp = (String) parsedOptions.get("internal_ip");
-    }
-
-    protected void setup() throws Exception {
-        this.vmcAuthHelper = new VmcAuthenticationHelper();
-        this.vmcClient = this.vmcAuthHelper.newVmcClient(this.vmcServer,
-        		this.cspServer, this.refreshToken);
-        this.publicIpsStub = vmcClient.createStub(Publicips.class);
-        this.firewallConfigHelper = new FirewallConfigHelper(this.vmcClient,
-        		this.orgId, this.sddcId);
-        this.natConfigHelper = new NatConfigHelper(this.vmcClient,
-        		this.orgId, this.sddcId);
-    }
-
-    protected void run() throws Exception {
-        System.out.printf("\n\n#### Step 1: Request a new Public IP Address");
-        SddcAllocatePublicIpSpec sddcAllocateSpec =
-                new SddcAllocatePublicIpSpec.Builder(1)
-                .setNames(Collections.singletonList(PUBLIC_IP_NOTES))
-                .build();
-
-        Task publicIpCreateTask = publicIpsStub.create(this.orgId, this.sddcId, sddcAllocateSpec);
-        String taskId = publicIpCreateTask.getId();
-        System.out.printf("\nPolling the REQUEST PUBLIC IP task (taskId = %s) :", taskId);
-        boolean taskCompleted = VmcTaskHelper.pollTask(vmcClient, orgId, taskId,
-        		TASK_POLLING_DELAY_IN_MILLISECONDS);
-        if(!taskCompleted) {
-            System.out.println("REQUEST PUBLIC IP task was either canceled or it failed. Exiting.");
-            System.exit(1);
-        }
-
-        List<SddcPublicIp> publicipList = publicIpsStub.list(this.orgId, this.sddcId);
-        boolean found = false;
-        for(SddcPublicIp ip : publicipList) {
-            if(ip.getName().equals(PUBLIC_IP_NOTES)) {
-                this.ipId = ip.getAllocationId();
-                this.publicIp = ip.getPublicIp();
-                found = true;
-                System.out.printf("Successfully requested a new Public IP Address: %s", this.publicIp);
-                break;
-            }
-        }
-        if(!found) {
-            throw new Exception("Can't find public IP with notes " + PUBLIC_IP_NOTES);
-        }
-
-        System.out.printf("\n\n#### Step 2: Create a new Firewall Rule"
-        		+ " which allows any to any traffic");
-        this.firewallConfigHelper.createAnyToAnyFirewallRule(DEFAULT_FIREWALL_RULE_NAME,
-        		EdgeType.COMPUTE_GATEWAY);
-
-        System.out.printf("\n\n#### Step 3: Create a new NAT Rule to translate "
-        		+ "the public IP address to an internal IP address");
-        this.natConfigHelper.createNatRule(DEFAULT_NAT_RULE_DESCRIPTION, EdgeType.COMPUTE_GATEWAY,
-                this.publicIp, this.internalIp);
-    }
-
-    protected void cleanup() throws Exception {
-        System.out.printf("\n\n#### Cleanup: Delete Firewall Rule");
-        this.firewallConfigHelper.deleteFirewallRule(DEFAULT_FIREWALL_RULE_NAME,
-        		EdgeType.COMPUTE_GATEWAY);
-
-        System.out.printf("\n\n#### Cleanup: Delete NAT rule");
-        this.natConfigHelper.deleteNatRule(DEFAULT_NAT_RULE_DESCRIPTION, EdgeType.COMPUTE_GATEWAY);
-
-        System.out.printf("\n\n#### Cleanup: Release Public IP");
-        this.publicIpsStub.delete(this.orgId, this.sddcId, this.ipId);
-        System.out.printf("\nPublic IP Address \"%s\" has been released", this.publicIp);
-    }
-
-    public static void main(String[] args) throws Exception {
-        /*
-         * Execute the sample using the command line arguments or parameters
-         * from the configuration file. This executes the following steps:
-         * 1. Parse the arguments required by the sample
-         * 2. Login to the server
-         * 3. Setup any resources required by the sample run
-         * 4. Run the sample
-         * 5. Cleanup any data created by the sample run, if cleanup=true
-         * 6. Logout of the server
-         */
-        new ExposeVMPublicIP().execute(args);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/vmware/samples/vmc/networks/FirewallRulesCrud.java b/src/main/java/vmware/samples/vmc/networks/FirewallRulesCrud.java
deleted file mode 100644
index 40b8680e034..00000000000
--- a/src/main/java/vmware/samples/vmc/networks/FirewallRulesCrud.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * *******************************************************
- * Copyright VMware, Inc. 2018.  All Rights Reserved.
- * SPDX-License-Identifier: MIT
- * *******************************************************
- *
- * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
- * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
- * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
- * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-package vmware.samples.vmc.networks;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.commons.cli.Option;
-
-import com.vmware.vapi.client.ApiClient;
-import com.vmware.vmc.model.AddressFWSourceDestination;
-import com.vmware.vmc.model.Application;
-import com.vmware.vmc.model.EdgeSummary;
-import com.vmware.vmc.model.FirewallRules;
-import com.vmware.vmc.model.Nsxfirewallrule;
-import com.vmware.vmc.model.Nsxfirewallservice;
-import com.vmware.vmc.model.Sddc;
-import com.vmware.vmc.orgs.Sddcs;
-import com.vmware.vmc.orgs.sddcs.networks.Edges;
-import com.vmware.vmc.orgs.sddcs.networks.edges.firewall.Config;
-import com.vmware.vmc.orgs.sddcs.networks.edges.firewall.config.Rules;
-
-import vmware.samples.common.VmcSamplesAbstractBase;
-import vmware.samples.common.authentication.VmcAuthenticationHelper;
-
-/**
- * Description: Demonstrates firewall rule CRUD operations.
- *
- * Author: VMware, Inc.
- * Sample Prerequisites:
- *   - An organization associated with the calling user.
- *   - A SDDC in the organization
- */
-public class FirewallRulesCrud extends VmcSamplesAbstractBase {
-    private String orgId, sddcId, edgeId;
-    private String ruleName;
-    private boolean useComputeGateway;
-    private Edges edges;
-    private Sddcs sddcs;
-    private Rules rules;
-    private Config firewallConfig;
-    private Nsxfirewallrule firewallRule;
-    long ruleId;
-
-    private static final String DEFAULT_FIREWALL_RULE_NAME = "Sample Firewall Rule";
-
-    /**
-     * Define the options specific to this sample and configure the sample using
-     * command-line arguments or a config file
-     *
-     * @param args command line arguments passed to the sample
-     */
-    @Override
-    protected void parseArgs(String[] args) {
-        Option orgOption = Option.builder()
-                .longOpt("org_id")
-                .desc("Specify the organization id")
-                .argName("ORGANIZATION ID")
-                .required(true)
-                .hasArg()
-                .build();
-        Option sddcOption = Option.builder()
-                .longOpt("sddc_id")
-                .desc("Specify the SDDC id")
-                .argName("SDDC ID")
-                .required(true)
-                .hasArg()
-                .build();
-        Option ruleNameOption = Option.builder()
-                .longOpt("rule_name")
-                .desc("OPTIONAL: Name of the new firewall rule")
-                .argName("FIREWALL RULE")
-                .required(false)
-                .hasArg()
-                .build();
-        Option useComputeGatewayOption = Option.builder()
-                .longOpt("use_compute_gateway")
-                .desc("OPTIONAL: Use compute gateway. Default is using management gateway")
-                .argName("USE COMPUTE GATEWAY")
-                .required(false)
-                .type(Boolean.class)
-                .build();
-        List<Option> optionList = Arrays.asList(orgOption, sddcOption, ruleNameOption, useComputeGatewayOption);
-
-        super.parseArgs(optionList, args);
-        this.orgId = (String) parsedOptions.get("org_id");
-        this.sddcId = (String) parsedOptions.get("sddc_id");
-        this.ruleName = (String) parsedOptions.get("rule_name");
-        if(this.ruleName == null) {
-          this.ruleName = DEFAULT_FIREWALL_RULE_NAME;
-        }
-
-        Object useComputeGwObj = parsedOptions.get("use_compute_gateway");
-        if (useComputeGwObj != null) {
-            this.useComputeGateway = (Boolean) useComputeGwObj;
-        } else {
-            this.useComputeGateway = false;
-        }
-    }
-
-    @Override
-    protected void setup() throws Exception {
-        this.vmcAuthHelper = new VmcAuthenticationHelper();
-        ApiClient vmcClient =
-                this.vmcAuthHelper.newVmcClient(this.vmcServer,
-                        this.cspServer, this.refreshToken);
-        this.edges = vmcClient.createStub(Edges.class);
-        this.sddcs = vmcClient.createStub(Sddcs.class);
-        this.rules = vmcClient.createStub(Rules.class);
-        this.firewallConfig = vmcClient.createStub(Config.class);
-    }
-
-    @Override
-    protected void run() throws Exception {
-        createFirewallRule();
-        getFirewallRule();
-        updateFirewallRule();
-    }
-
-    private void createFirewallRule() {
-        System.out.println("\n\n### Example: Add a firewall rule\n");
-        List<EdgeSummary> edgeList =
-                this.edges.get(orgId, sddcId, "gatewayServices", null, null, null, null, null, null, null)
-                    .getEdgePage().getData();
-        System.out.printf("Management Gateway ID: %s\n", edgeList.get(0).getId());
-        System.out.printf("Compute Gateway ID: %s\n", edgeList.get(1).getId());
-
-        this.edgeId = useComputeGateway ? edgeList.get(1).getId() : edgeList.get(0).getId();
-
-        System.out.printf("Using edge \"%s\" to create new firewall rule\n", this.edgeId);
-        Sddc sddc = this.sddcs.get(this.orgId, this.sddcId);
-        List<String> destIpAddresses =
-                Arrays.asList(sddc.getResourceConfig().getVcPublicIp(), sddc.getResourceConfig().getVcManagementIp());
-        this.firewallRule =
-                new Nsxfirewallrule.Builder()
-                .setRuleType("user")
-                .setName(this.ruleName)
-                .setEnabled(true)
-                .setAction("accept")
-                .setSource(
-                        new AddressFWSourceDestination.Builder()
-                        .setExclude(false)
-                        .setIpAddress(Collections.singletonList("any"))
-                        .build())
-                .setDestination(
-                        new AddressFWSourceDestination.Builder()
-                        .setExclude(false)
-                        .setIpAddress(destIpAddresses)
-                        .build())
-                .setApplication(
-                        new Application.Builder()
-                        .setApplicationId(Collections.<String>emptyList())
-                        .setService(Collections.singletonList(
-                                        new Nsxfirewallservice.Builder()
-                                        .setSourcePort(Collections.singletonList("443"))
-                                        .setProtocol("TCP")
-                                        .setIcmpType("")
-                                        .build()))
-                        .build())
-                .build();
-        rules.add(this.orgId, this.sddcId, this.edgeId,
-                  new FirewallRules.Builder()
-                  .setFirewallRules(Collections.singletonList(this.firewallRule))
-                  .build());
-        System.out.printf("\nNew firewall rule \"%s\" is added", this.ruleName);
-    }
-
-    private void getFirewallRule() {
-        System.out.println("\n\n#### Example: List all firewall rules");
-        FirewallRules rules = firewallConfig.get(this.orgId, this.sddcId, this.edgeId).getFirewallRules();
-        List<Nsxfirewallrule> nsxFirewallRulesList = rules.getFirewallRules();
-        for(Nsxfirewallrule rule : nsxFirewallRulesList) {
-            System.out.printf("\nName: %s, Description: %s", rule.getName(), rule.getDescription());
-        }
-
-        System.out.println("\n\n#### Example: Find the firewall rule that was created");
-        for(Nsxfirewallrule nsxRule : nsxFirewallRulesList) {
-            if(nsxRule.getName().equals(this.ruleName)) {
-                System.out.printf("\nFound NSX Firwall rule with name %s", nsxRule.getName());
-                this.ruleId = nsxRule.getRuleId();
-                System.out.printf("\nFirewall Rule Specs for rule \"%s\"\n", this.ruleName);
-                System.out.println(this.rules.get(this.orgId, this.sddcId, this.edgeId, this.ruleId));
-                break;
-            }
-        }
-    }
-
-    private void updateFirewallRule() {
-        System.out.println("\n\n#### Example: Update firewall rule");
-        String updatedDescription = "Updated description";
-        String updatedRuleName = "Sample Firewall Rule - Updated";
-        String updatedAction = "deny";
-        String updatedSourceIp = "127.0.0.1";
-
-        this.firewallRule.setDescription(updatedDescription);
-        this.firewallRule.setName(updatedRuleName);
-        this.firewallRule.setAction(updatedAction);
-        this.firewallRule.getSource().setIpAddress(Collections.singletonList(updatedSourceIp));
-        rules.update(this.orgId, this.sddcId, this.edgeId, this.ruleId, this.firewallRule);
-
-        System.out.printf("\nFirewall rule has been updated. Specs of the updated rule is:\n",
-            this.firewallRule.getName());
-        Nsxfirewallrule updatedRule = this.rules.get(this.orgId, this.sddcId, this.edgeId, this.ruleId);
-        System.out.println(updatedRule);
-    }
-
-    private void deleteFirewallRule() {
-        this.rules.delete(this.orgId, this.sddcId, this.edgeId, this.ruleId);
-        System.out.printf("\nFirewall rule \"%s\" deleted", this.ruleName);
-    }
-
-    @Override
-    protected void cleanup() throws Exception {
-        if(this.ruleId !=0) {
-            System.out.println("\n#### Example: Delete a firewall rule");
-            deleteFirewallRule();
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        /*
-         * Execute the sample using the command line arguments or parameters
-         * from the configuration file. This executes the following steps:
-         * 1. Parse the arguments required by the sample
-         * 2. Login to the server
-         * 3. Setup any resources required by the sample run
-         * 4. Run the sample
-         * 5. Cleanup any data created by the sample run, if cleanup=true
-         * 6. Logout of the server
-         */
-        new FirewallRulesCrud().execute(args);
-    }
-}
diff --git a/src/main/java/vmware/samples/vmc/networks/LogicalNetworkCrud.java b/src/main/java/vmware/samples/vmc/networks/LogicalNetworkCrud.java
deleted file mode 100644
index 96a0985bce3..00000000000
--- a/src/main/java/vmware/samples/vmc/networks/LogicalNetworkCrud.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * *******************************************************
- * Copyright VMware, Inc. 2018.  All Rights Reserved.
- * SPDX-License-Identifier: MIT
- * *******************************************************
- *
- * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
- * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
- * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
- * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-package vmware.samples.vmc.networks;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.commons.cli.Option;
-
-import com.vmware.vapi.client.ApiClient;
-import com.vmware.vmc.model.EdgeSummary;
-import com.vmware.vmc.model.SddcNetwork;
-import com.vmware.vmc.model.SddcNetworkAddressGroup;
-import com.vmware.vmc.model.SddcNetworkAddressGroups;
-import com.vmware.vmc.model.SddcNetworkDhcpConfig;
-import com.vmware.vmc.model.SddcNetworkDhcpIpPool;
-import com.vmware.vmc.orgs.sddcs.networks.Edges;
-import com.vmware.vmc.orgs.sddcs.networks.Logical;
-
-import vmware.samples.common.VmcSamplesAbstractBase;
-import vmware.samples.common.authentication.VmcAuthenticationHelper;
-
-/**
- * Description: Demonstrates how to create/delete a logical network.
- *
- * Author: VMware, Inc.
- * Sample Prerequisites:
- *   - An organization associated with the calling user.
- *   - A SDDC in the organization
- */
-public class LogicalNetworkCrud extends VmcSamplesAbstractBase {
-    private String orgId, sddcId, edgeId, networkId, networkName, primaryAddress, prefixLength, dhcpRange;
-    private Edges edges;
-    private Logical logicalNetwork;
-
-    /**
-     * Define the options specific to this sample and configure the sample using
-     * command-line arguments or a config file
-     *
-     * @param args command line arguments passed to the sample
-     */
-    @Override
-    protected void parseArgs(String[] args) {
-        Option orgOption = Option.builder()
-                .longOpt("org_id")
-                .desc("Specify the organization id")
-                .argName("ORGANIZATION ID")
-                .required(true)
-                .hasArg()
-                .build();
-        Option sddcOption = Option.builder()
-                .longOpt("sddc_id")
-                .desc("Specify the SDDC id")
-                .argName("SDDC ID")
-                .required(true)
-                .hasArg()
-                .build();
-        Option networkNameOption = Option.builder()
-                .longOpt("network_name")
-                .desc("Name of the new logical network")
-                .argName("NETWORK NAME")
-                .required(true)
-                .hasArg()
-                .build();
-        Option subnetOption = Option.builder()
-                .longOpt("subnet")
-                .desc("Specify subnet of the logical network e.g. 192.168.52.1/24 ")
-                .argName("LOGICAL NETWORK SUBNET")
-                .required(true)
-                .hasArg()
-                .build();
-        Option dhcpRangeOption = Option.builder()
-                .longOpt("dhcp_range")
-                .desc("Specify the DHCP IP range for the logical network e.g.192.168.52.2-192.168.52.10")
-                .argName("DHCP RANGE")
-                .required(true)
-                .hasArg()
-                .build();
-        List<Option> optionList =
-            Arrays.asList(orgOption, sddcOption, networkNameOption, subnetOption, dhcpRangeOption);
-
-        super.parseArgs(optionList, args);
-        this.orgId = (String) parsedOptions.get("org_id");
-        this.sddcId = (String) parsedOptions.get("sddc_id");
-        this.networkName = (String) parsedOptions.get("network_name");
-        this.primaryAddress = ((String) parsedOptions.get("subnet")).split("/")[0];
-        this.prefixLength = ((String) parsedOptions.get("subnet")).split("/")[1];
-        this.dhcpRange = (String) parsedOptions.get("dhcp_range");
-    }
-
-    @Override
-    protected void setup() throws Exception {
-        this.vmcAuthHelper = new VmcAuthenticationHelper();
-        ApiClient vmcClient =
-                this.vmcAuthHelper.newVmcClient(this.vmcServer,
-                        this.cspServer, this.refreshToken);
-        this.edges = vmcClient.createStub(Edges.class);
-        this.logicalNetwork = vmcClient.createStub(Logical.class);
-    }
-
-    @Override
-    protected void run() throws Exception {
-        createLogicalNetwork();
-        getLogicalNetwork();
-    }
-
-    private void createLogicalNetwork() {
-        System.out.println("\n#### Example: Add a logical network to compute gateway");
-        List<EdgeSummary> edgeList =
-                this.edges.get(this.orgId, this.sddcId, "gatewayServices", null, null, null, null, null, null, null)
-                    .getEdgePage().getData();
-        this.edgeId = edgeList.get(1).getId();
-        List<SddcNetworkDhcpIpPool> dhcpPool =
-                Collections.singletonList(
-                        new SddcNetworkDhcpIpPool.Builder()
-                        .setIpRange(this.dhcpRange)
-                        .build());
-        SddcNetwork network =
-                new SddcNetwork.Builder(this.networkName, this.edgeId)
-                .setCgwName(this.networkName)
-                .setDhcpConfigs(new SddcNetworkDhcpConfig.Builder().setIpPools(dhcpPool).build())
-                .setSubnets(new SddcNetworkAddressGroups.Builder()
-                            .setAddressGroups(Collections.singletonList(
-                                    new SddcNetworkAddressGroup.Builder()
-                                    .setPrefixLength(this.prefixLength)
-                                    .setPrimaryAddress(this.primaryAddress)
-                                    .build()))
-                            .build())
-                .build();
-        this.logicalNetwork.create(this.orgId, this.sddcId, network);
-        System.out.printf("\nNew logical network %s added", this.networkName);
-    }
-
-    private void getLogicalNetwork() {
-        System.out.println("\n#### Example: Display the Logical Network Specs");
-        List<SddcNetwork> networks =
-                this.logicalNetwork.get0(this.orgId, this.sddcId, null, null, null, null).getData();
-        for(SddcNetwork network : networks) {
-            if(network.getName().equals(this.networkName)) {
-                this.networkId = network.getId();
-                break;
-            }
-        }
-
-        SddcNetwork sddcNetwork = this.logicalNetwork.get(this.orgId, this.sddcId, this.networkId);
-        System.out.println(sddcNetwork);
-    }
-
-    private void deleteLogicalNetwork() {
-        this.logicalNetwork.delete(this.orgId, this.sddcId, this.networkId);
-    }
-
-    @Override
-    protected void cleanup() throws Exception {
-        if(this.networkId != null) {
-            System.out.println("\n#### Example: Delete the Logical Network");
-            deleteLogicalNetwork();
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        /*
-         * Execute the sample using the command line arguments or parameters
-         * from the configuration file. This executes the following steps:
-         * 1. Parse the arguments required by the sample
-         * 2. Login to the server
-         * 3. Setup any resources required by the sample run
-         * 4. Run the sample
-         * 5. Cleanup any data created by the sample run, if cleanup=true
-         * 6. Logout of the server
-         */
-        new LogicalNetworkCrud().execute(args);
-    }
-}
diff --git a/src/main/java/vmware/samples/vmc/networks/NatRuleCrud.java b/src/main/java/vmware/samples/vmc/networks/NatRuleCrud.java
deleted file mode 100644
index ac01f03f182..00000000000
--- a/src/main/java/vmware/samples/vmc/networks/NatRuleCrud.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * *******************************************************
- * Copyright VMware, Inc. 2018.  All Rights Reserved.
- * SPDX-License-Identifier: MIT
- * *******************************************************
- *
- * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
- * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
- * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
- * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-package vmware.samples.vmc.networks;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.commons.cli.Option;
-
-import com.vmware.vapi.client.ApiClient;
-import com.vmware.vmc.model.EdgeSummary;
-import com.vmware.vmc.model.NatRules;
-import com.vmware.vmc.model.Nsxnatrule;
-import com.vmware.vmc.orgs.sddcs.networks.Edges;
-import com.vmware.vmc.orgs.sddcs.networks.edges.nat.Config;
-import com.vmware.vmc.orgs.sddcs.networks.edges.nat.config.Rules;
-
-import vmware.samples.common.VmcSamplesAbstractBase;
-import vmware.samples.common.authentication.VmcAuthenticationHelper;
-
-/**
- * Description: Demonstrates NAT Rule CRUD operations.
- *
- * Author: VMware, Inc.
- * Sample Prerequisites:
- *   - An organization associated with the calling user.
- *   - A SDDC in the organization
- */
-public class NatRuleCrud extends VmcSamplesAbstractBase {
-    private static final String DEFAULT_NAT_RULE_DESCRIPTION = "Sample NAT RULE";
-
-    private String orgId, sddcId, publicIp, internalIp, ruleDesc, edgeId;
-    private Edges edges;
-    private Rules rules;
-    private Config natRuleConfig;
-    private long ruleId;
-
-    /**
-     * Define the options specific to this sample and configure the sample using
-     * command-line arguments or a config file
-     *
-     * @param args command line arguments passed to the sample
-     */
-    @Override
-    protected void parseArgs(String[] args) {
-        Option orgOption = Option.builder()
-                .longOpt("org_id")
-                .desc("Specify the organization id")
-                .argName("ORGANIZATION ID")
-                .required(true)
-                .hasArg()
-                .build();
-        Option sddcOption = Option.builder()
-                .longOpt("sddc_id")
-                .desc("Specify the SDDC id")
-                .argName("SDDC ID")
-                .required(true)
-                .hasArg()
-                .build();
-        Option publicIpOption = Option.builder()
-                .longOpt("public_ip")
-                .desc("Specify the public IP range for the NAT Rule")
-                .argName("PUBLIC IP RANGE")
-                .required(true)
-                .hasArg()
-                .build();
-        Option internalIpOption = Option.builder()
-                .longOpt("internal_ip")
-                .desc("Specify the NAT Rule subnet. e.g. 192.168.200.1/24")
-                .argName("NAT RULE SUBNET")
-                .required(true)
-                .hasArg()
-                .build();
-        Option ruleDescriptionOption = Option.builder()
-                .longOpt("rule_description")
-                .desc("OPTIONAL: Specify the description of the NAT Rule")
-                .argName("RULE DESCRIPTION")
-                .required(false)
-                .hasArg()
-                .build();
-        List<Option> optionList = Arrays.asList(orgOption, sddcOption, publicIpOption, internalIpOption,
-                ruleDescriptionOption);
-
-        super.parseArgs(optionList, args);
-        this.orgId = (String) parsedOptions.get("org_id");
-        this.sddcId = (String) parsedOptions.get("sddc_id");
-        this.publicIp = (String) parsedOptions.get("public_ip");
-        this.internalIp = (String) parsedOptions.get("internal_ip");
-        this.ruleDesc = (String) parsedOptions.get("rule_description");
-        if(this.ruleDesc == null) {
-          this.ruleDesc = DEFAULT_NAT_RULE_DESCRIPTION;
-        }
-    }
-
-    @Override
-    protected void setup() throws Exception {
-        this.vmcAuthHelper = new VmcAuthenticationHelper();
-        ApiClient vmcClient =
-                this.vmcAuthHelper.newVmcClient(this.vmcServer,
-                        this.cspServer, this.refreshToken);
-        this.edges = vmcClient.createStub(Edges.class);
-        this.rules = vmcClient.createStub(Rules.class);
-        this.natRuleConfig = vmcClient.createStub(Config.class);
-    }
-
-    @Override
-    protected void run() throws Exception {
-        createNatRule();
-        getNatRule();
-        updateNatRule();
-    }
-
-    private void createNatRule() {
-        System.out.println("\n#### Example: Add a NAT Rule to the Compute Gateway");
-        Nsxnatrule nsxNatRule =
-                new Nsxnatrule.Builder()
-                .setVnic("0")
-                .setRuleType("user")
-                .setAction("dnat")
-                .setProtocol("tcp")
-                .setDescription(this.ruleDesc)
-                .setOriginalAddress(this.publicIp)
-                .setOriginalPort("443")
-                .setTranslatedAddress(this.internalIp)
-                .setTranslatedPort("443")
-                .setEnabled(true)
-                .build();
-        List<EdgeSummary> edges =
-                this.edges.get(this.orgId, this.sddcId, "gatewayServices", null, null, null, null, null, null, null)
-                  .getEdgePage().getData();
-        this.edgeId = edges.get(1).getId();
-        rules.add(this.orgId, this.sddcId, this.edgeId,
-                new NatRules.Builder()
-                .setNatRulesDtos(Collections.singletonList(nsxNatRule))
-                .build());
-        System.out.printf("\nNew NAT Rule with description \"%s\" added to the Compute Gateway",
-                nsxNatRule.getDescription());
-    }
-
-    private void getNatRule() {
-        System.out.println("\n#### Example: Display all the NAT Rules");
-        List<Nsxnatrule> natRules =
-                this.natRuleConfig.get(this.orgId, this.sddcId, this.edgeId).getRules().getNatRulesDtos();
-        for(Nsxnatrule rule : natRules) {
-            System.out.printf("\nDescription: %s\tOriginal Address=%s\t"
-                    + "OriginalPor=%s\tTranslated Address=%s\tTranslated Port=%s",
-                    rule.getDescription(), rule.getOriginalAddress(), rule.getOriginalPort(),
-                    rule.getTranslatedAddress(), rule.getTranslatedPort());
-        }
-
-        System.out.println("\n\n#### Example: Find the NAT Rule that was created");
-        for(Nsxnatrule rule : natRules) {
-            if(rule.getDescription().equals(this.ruleDesc)) {
-                System.out.printf("\nFound NAT Rule with description %s", rule.getDescription());
-                this.ruleId = rule.getRuleId();
-                System.out.printf("\nNAT Rule Specs for rule \"%s\"\n", rule.getDescription());
-                System.out.println(rule);
-                break;
-            }
-        }
-    }
-
-    private void updateNatRule() {
-        System.out.println("\n#### Example: Update the NAT Rule");
-        Nsxnatrule updatedNatRule =
-                new Nsxnatrule.Builder()
-                .setVnic("0")
-                .setRuleType("user")
-                .setAction("dnat")
-                .setProtocol("tcp")
-                .setDescription("Updated Description")
-                .setOriginalAddress(this.publicIp)
-                .setOriginalPort("any")
-                .setTranslatedAddress(this.internalIp)
-                .setTranslatedPort("443")
-                .setEnabled(true)
-                .build();
-        this.rules.update(this.orgId, this.sddcId, this.edgeId, this.ruleId, updatedNatRule);
-        System.out.printf("\nNAT Rule \"ruleId=%s\" updated\n", this.ruleId);
-    }
-
-    private void deleteNatRule() {
-        this.rules.delete(this.orgId, this.sddcId, this.edgeId, this.ruleId);
-        System.out.printf("\nNAT Rule \"ruleId=%s\" deleted", this.ruleId);
-    }
-
-    @Override
-    protected void cleanup() throws Exception {
-        if(this.ruleId != 0) {
-            System.out.println("\n#### Example: Delete the NAT Rule");
-            deleteNatRule();
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        /*
-         * Execute the sample using the command line arguments or parameters
-         * from the configuration file. This executes the following steps:
-         * 1. Parse the arguments required by the sample
-         * 2. Login to the server
-         * 3. Setup any resources required by the sample run
-         * 4. Run the sample
-         * 5. Cleanup any data created by the sample run, if cleanup=true
-         * 6. Logout of the server
-         */
-        new NatRuleCrud().execute(args);
-    }
-}