Reconciling diff between old master and master after rebasing from cs…

…e_3_1_updates

Signed-off-by: rocknes <[email protected]>

docs/cse3_1/CSE31.md

@@ -139,11 +139,6 @@ CSE can be upgraded from CSE 3.1.0 and CSE 3.0.z to 3.1.1 GA.
 Any CSE release older than CSE 3.0.0 first needs to be upgraded to
 CSE 3.0.z product line before it can be upgraded to CSE 3.1.1.
 
-**3.1.0**  
-CSE can be upgraded to 3.1.0, only from CSE 3.0.z product line.
-Any CSE release older than CSE 3.0.0 first needs to be upgraded to
-CSE 3.0.z product line before it can be upgraded to CSE 3.1.0.
-
 <a name="remove_tkgm"></a>
 **Note** :
 If Tanzu Kubernetes Grid (TKG) distribution is enabled
@@ -166,6 +161,19 @@ a Kubernetes application backup/restore strategy to backup the applications data
 
 Refer to [CSE 3.1 upgrade command](CSE_SERVER_MANAGEMENT.html#cse31-upgrade-cmd) for details.
 
+**3.1.0**
+CSE can be upgraded to 3.1.0, only from CSE 3.0.z product line.
+Any CSE release older than CSE 3.0.0 first needs to be upgraded to
+CSE 3.0.z product line before it can be upgraded to CSE 3.1.0.
+
+<a name="remove_tkgm_310"></a>
+**Note** :
+If Tanzu Kubernetes Grid (TKG) distribution is enabled
+on [CSE 3.0.z](https://github.com/vmware/container-service-extension-templates/blob/tkgm/TKG_INSTRUCTIONS.md),
+then please consider upgrading to CSE 3.1.1 following these [steps](CSE31.html#remove_tkgm).
+
+Refer to [CSE 3.1 upgrade command](CSE_SERVER_MANAGEMENT.html#cse31-upgrade-cmd) for details.
+
 #### 2.2.4 Tenant onboarding
 The provider needs to perform below operations to enable Kubernetes cluster
 deployments in tenant organizations and tenant virtual data centers.

docs/cse3_1/CSE_CONFIG.md

@@ -409,4 +409,3 @@ propagate the password to CSE via the environment variable `CSE_CONFIG_PASSWORD`
 The default behavior can be changed to keep CSE Server accept plain text
 configuration files using the flag `--skip-config-decryption` with any CSE
 command that accepts a configuration file. 
-

docs/cse3_1/KNOWN_ISSUES.md

@@ -37,10 +37,25 @@ Delete operation on a cluster that is in an error state (`RDE.state = RESOLUTION
 may fail with Bad request (400).
 
 **Workaround**:
+
+VCD 10.3:
+
+Login as the user who installed CSE (the user provided in CSE configuration file during `cse install`).
+
+1. RDE resolution : Perform `POST https://<vcd-fqdn>/cloudapi/1.0.0/entities/{cluster-id}/resolve`
+2. RDE deletion: Perform `DELETE https://<vcd-fqdn>/cloudapi/1.0.0/entities/{cluster-id}?invokeHooks=false`
+3. vApp deletion: Delete the corresponding vApp from UI (or) via API call.
+    - API call: Perform `GET https://<vcd-fqdn>/cloudapi/1.0.0/entities/{cluster-id}` to retrieve the
+      vApp Id, which is same as the `externalID` property in the corresponding RDE. Invoke Delete vApp API.
+    - UI: Identify the vApp with the same name as the cluster in the same Organization virtual datacenter and delete it.
+
+VCD 10.2:
+
 Login as System administrator (or) user with ADMIN_FC right on `cse:nativeCluster` entitlement
 
-1. RDE deletion: Perform `DELETE https://<vcd-fqdn>/cloudapi/1.0.0/entities/id?invokeHooks=false`
-2. vApp deletion: Delete the corresponding vApp from UI (or) via API call.
+1. RDE resolution : Perform `POST https://<vcd-fqdn>/cloudapi/1.0.0/entities/{cluster-id}/resolve`
+2. RDE deletion: Perform `DELETE https://<vcd-fqdn>/cloudapi/1.0.0/entities/{id}`
+3. vApp deletion: Delete the corresponding vApp from UI (or) via API call.
     - API call: Perform `GET https://<vcd-fqdn>/cloudapi/1.0.0/entities/<cluster-id>` to retrieve the
       vApp Id, which is same as the `externalID` property in the corresponding RDE. Invoke Delete vApp API.
     - UI: Identify the vApp with the same name as the cluster in the same Organization virtual datacenter and delete it.

docs/cse3_1/RELEASE_NOTES.md

@@ -5,6 +5,11 @@ title: Release Notes
 
 # Release Notes
 
+## Announcement
+Date : 2021-12-15
+
+CSE is not impacted by the Apache Log4j open source component vulnerability.
+
 ## CSE 3.1.1 GA (3.1.1)
 Release Date : 2021-10-14
 

system_tests_v2/test_cse_server.py

@@ -244,7 +244,6 @@ def test_0050_config_invalid_value_types(config):
         except TypeError as e:
             PYTEST_LOGGER.debug("Validation failed as expected due "
                                 f"to invalid value: {e}")
-            pass
 
 
 def test_0060_config_valid(config):
@@ -371,9 +370,7 @@ def test_0110_cse_check_valid_installation(config):
     """
     try:
         cmd = f"check {env.ACTIVE_CONFIG_FILEPATH} --skip-config-decryption --check-install"  # noqa: E501
-        result = env.CLI_RUNNER.invoke(cli,
-                                       cmd.split(),
-                                       catch_exceptions=False)
+        result = env.CLI_RUNNER.invoke(cli, cmd.split(), catch_exceptions=False)  # noqa: E501
         PYTEST_LOGGER.debug(f"Executing command: {cmd}")
         PYTEST_LOGGER.debug(f"Exit code: {result.exit_code}")
         PYTEST_LOGGER.debug(f"Output: {result.output}")
@@ -411,17 +408,17 @@ def test_0120_cse_run(config):
             PYTEST_LOGGER.debug(f"Executing command: {cmd}")
             PYTEST_LOGGER.debug(msg)
             assert False, msg
-        except subprocess.TimeoutExpired:
-            pass
+        except subprocess.TimeoutExpired as e:
+            PYTEST_LOGGER.debug(f"CSE run command execution timedout: {e}")
         finally:
             try:
                 if p:
                     if os.name == 'nt':
                         subprocess.run(f"taskkill /f /pid {p.pid} /t")
                     else:
                         p.terminate()
-            except OSError:
-                pass
+            except OSError as e:
+                PYTEST_LOGGER.debug(f"Operating System exception occurred: {e}")  # noqa: E501
 
 
 def test_0130_cse_encrypt_decrypt_with_password_from_stdin(config):