diff --git a/specification/managednetwork/resource-manager/readme.cli.md b/specification/managednetwork/resource-manager/readme.cli.md
new file mode 100644
index 000000000000..31ea0f7ae092
--- /dev/null
+++ b/specification/managednetwork/resource-manager/readme.cli.md
@@ -0,0 +1,15 @@
+## CLI
+
+These settings apply only when `--cli` is specified on the command line.
+
+``` yaml $(cli)
+cli:
+  cli-name: managednetwork
+  namespace: azure.mgmt.managednetwork
+  package-name: azure-mgmt-managednetwork
+  debug: true
+  adjustments:
+    "/sku": "Sku*/"
+  test-setup:
+    - name: Create or Update a service with all parameters
+```
diff --git a/specification/managednetwork/resource-manager/readme.md b/specification/managednetwork/resource-manager/readme.md
index b64206e5d263..d728435d48d2 100644
--- a/specification/managednetwork/resource-manager/readme.md
+++ b/specification/managednetwork/resource-manager/readme.md
@@ -69,6 +69,10 @@ csharp:
   clear-output-folder: true
 ```
 
+## CLI
+
+See configuration in [readme.cli.md](./readme.cli.md)
+
 ## Multi-API/Profile support for AutoRest v3 generators 
 AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files.
 
diff --git a/specification/managednetwork/resource-manager/readme.python.md b/specification/managednetwork/resource-manager/readme.python.md
index e380dea3d78f..3c302015817c 100644
--- a/specification/managednetwork/resource-manager/readme.python.md
+++ b/specification/managednetwork/resource-manager/readme.python.md
@@ -7,18 +7,17 @@ python:
   azure-arm: true
   license-header: MICROSOFT_MIT_NO_VERSION
   payload-flattening-threshold: 2
-  package-name: azure-mgmt-network
+  package-name: azure-mgmt-managednetwork
   clear-output-folder: true
-  no-namespace-folders: true
 ```
 
-### Tag: package-2019-06-01-preview and python
-
-These settings apply only when `--tag=package-2019-06-01-preview --python` is specified on the command line.
-Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
-
-``` yaml $(tag) == 'package-2019-06-01-preview' && $(python)
+``` yaml $(python) && $(python-mode) == 'update'
 python:
-  namespace: azure.mgmt.managednetwork.v2019_06_01_preview
+  no-namespace-folders: true
   output-folder: $(python-sdks-folder)/managednetwork/azure-mgmt-managednetwork/azure/mgmt/managednetwork
 ```
+``` yaml $(python) && $(python-mode) == 'create'
+python:
+  basic-setup-py: true
+  output-folder: $(python-sdks-folder)/managednetwork/azure-mgmt-managednetwork
+```