don't use default rg in test (#354)

* WIP * gather command params * format Co-authored-by: Qiaoqiao Zhang <55688292+qiaozha@users.noreply.github.com>
Azure · May 11, 2020 · 72f359e · 72f359e
1 parent 14c1a60
commit 72f359e
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 13 deletions.
diff --git a/src/plugins/azgenerator/CodeModelAz.ts b/src/plugins/azgenerator/CodeModelAz.ts
@@ -50,6 +50,7 @@ export class CommandExample {
     public HttpMethod: string;    // Get, Post, Put ...
     public MethodResponses: any[];
     public Method_IsLongRun: boolean;
+    public MethodParams: Map<string, MethodParam>;
 }
 
 export interface CodeModelAz
@@ -161,7 +162,7 @@ export interface CodeModelAz
 
     SelectFirstExample(): boolean;
     SelectNextExample(): boolean;
-    FindExampleById(id: string): string[][];
+    FindExampleById(id: string, commandParams: any): string[][];
     Example_Body: string[];
     Example_Title: string;
     Example_Params: any;

diff --git a/src/plugins/azgenerator/CodeModelAzImpl.ts b/src/plugins/azgenerator/CodeModelAzImpl.ts
@@ -1394,13 +1394,13 @@ export class CodeModelCliImpl implements CodeModelAz {
         return method_param_dict;
     }
 
-    public GetExampleParameters(example_obj): ExampleParam[] {
+    public GetExampleParameters(example_obj): [ExampleParam[], Map<string, MethodParam>] {
         let parameters: ExampleParam[] = [];
         let method_param_dict: Map<string, MethodParam> = this.GetMethodParametersDict();
         Object.entries(example_obj.parameters).forEach(([param_name, param_value]) => {
             this.FlattenExampleParameter(method_param_dict, parameters, param_name, param_value, []);
         })
-        return parameters;
+        return [parameters, method_param_dict];
     }
 
     private isDiscriminator(param: any): boolean {
@@ -1690,8 +1690,9 @@ export class CodeModelCliImpl implements CodeModelAz {
                 example.Path = this.Method_Path;
                 example.HttpMethod = this.Method_HttpMethod;
                 example.ResourceClassName = this.CommandGroup_Key;
-                let params: ExampleParam[] = this.GetExampleParameters(example_obj);
+                const [params, methodParams] = this.GetExampleParameters(example_obj);
                 example.Parameters = this.ConvertToCliParameters(params);
+                example.MethodParams = methodParams;
                 example.MethodResponses = this.Method.responses || [];
                 example.Method_IsLongRun = this.Method.extensions?.['x-ms-long-running-operation'] ? true : false;
                 if (this.filterExampleByPoly(example_obj, example)) {
@@ -1709,10 +1710,11 @@ export class CodeModelCliImpl implements CodeModelAz {
         return examples;
     }
 
-    public GetExampleItems(example: CommandExample, isTest: boolean): string[] {
+    public GetExampleItems(example: CommandExample, isTest: boolean, commandParams: any): string[] {
         let parameters: string[] = [];
         parameters.push("az " + this.Command_Name);
 
+        let hasRG = false;
         for (let param of example.Parameters) {
             let param_value = param.value;
             if (isTest) {
@@ -1727,6 +1729,14 @@ export class CodeModelCliImpl implements CodeModelAz {
                 slp = ToJsonString(slp);
             }
             parameters.push(param.name + " " + slp);
+
+            if (["--resource-group", "-g"].indexOf(param.name) >=0) {
+                hasRG = true;
+            }
+        }
+
+        if (isTest && !hasRG && commandParams && commandParams[this.Command_Name] && commandParams[this.Command_Name].has("resourceGroupName")) {
+            parameters.push('-g ""');
         }
 
         return parameters;
@@ -1776,10 +1786,10 @@ export class CodeModelCliImpl implements CodeModelAz {
         }
     }
 
-    public FindExampleById(id: string): string[][] {
+    public FindExampleById(id: string, commandParams?: any): string[][] {
         let ret: string[][] = [];
         this.GetAllExamples(id, (example) => {
-            ret.push(this.GetExampleItems(example, true));
+            ret.push(this.GetExampleItems(example, true, commandParams));
         });
         return ret;
     }
@@ -1861,6 +1871,19 @@ export class CodeModelCliImpl implements CodeModelAz {
             this._testScenario = GenerateDefaultTestScenarioByDependency(this.GetAllExamples(), this.resource_pool, this._testScenario);
             this.SortExamplesByDependency();
         }
+
+        let commandParams = {};
+        this.GetAllMethods(null, () => {
+            if (!commandParams[this.Command_Name]) commandParams[this.Command_Name] = new Set();
+            if (this.SelectFirstMethodParameter()) {
+                do {
+                    if ((this.MethodParameter.implementation == 'Method' || (this.MethodParameter as any).polyBaseParam) && !this.MethodParameter_IsFlattened && this.MethodParameter?.schema?.type != 'constant') {
+                        commandParams[this.Command_Name].add(this.MethodParameter.language['cli'].cliKey);
+                    }
+                } while (this.SelectNextMethodParameter());
+            }
+        });
+        return commandParams;
     }
 
     public SortExamplesByDependency() {

diff --git a/src/plugins/azgenerator/TemplateAzureCliTestScenario.ts b/src/plugins/azgenerator/TemplateAzureCliTestScenario.ts
@@ -17,7 +17,7 @@ export function GenerateAzureCliTestScenario(model: CodeModelAz): string[] {
     let body: string[] = [];
     let funcScenario: string[] = [];
 
-    model.GatherInternalResource();
+    let commandParams = model.GatherInternalResource();
     let config: any = deepCopy(model.Extension_TestScenario);
     config.unshift({ function: "setup" });
     config.push({ function: "cleanup" });
@@ -46,7 +46,7 @@ export function GenerateAzureCliTestScenario(model: CodeModelAz): string[] {
     for (var ci = 0; ci < config.length; ci++) {
         let exampleId: string = config[ci].name;
         if (exampleId) {
-            model.FindExampleById(exampleId);
+            model.FindExampleById(exampleId, commandParams);
         }
     }
 
@@ -84,7 +84,7 @@ export function GenerateAzureCliTestScenario(model: CodeModelAz): string[] {
             steps.push(...ToMultiLine(`def ${functionName}(test${parameterLine()}):`));
             // find example by name
             let found = false;
-            for (let exampleCmd of model.FindExampleById(exampleId)) {
+            for (let exampleCmd of model.FindExampleById(exampleId, commandParams)) {
                 if (exampleCmd && exampleCmd.length > 0) {
                     found = true;
                     for (let idx = 0; idx < exampleCmd.length; idx++) {

diff --git a/...tation/output/src/attestation/azext_attestation/tests/latest/test_attestation_scenario.py b/...tation/output/src/attestation/azext_attestation/tests/latest/test_attestation_scenario.py
@@ -55,7 +55,8 @@ def mytest(test, rg, rg_2, rg_3):
 # EXAMPLE: AttestationProviders_List
 @try_manual
 def step_attestationproviders_list(test, rg, rg_2, rg_3):
-    test.cmd('az attestation attestation-provider list-attestation',
+    test.cmd('az attestation attestation-provider list-attestation '
+             '-g ""',
              checks=[])
 
 

diff --git a/...actory/output/src/datafactory/azext_datafactory/tests/latest/test_datafactory_scenario.py b/...actory/output/src/datafactory/azext_datafactory/tests/latest/test_datafactory_scenario.py
@@ -44,7 +44,8 @@ def step__factories_get_factories_get(test, rg):
 # EXAMPLE: /Factories/get/Factories_List
 @try_manual
 def step__factories_get_factories_list(test, rg):
-    test.cmd('az datafactory list',
+    test.cmd('az datafactory list '
+             '-g ""',
              checks=[])
 
 

diff --git a/...t/src/managed-network/azext_managed_network/tests/latest/test_managed_network_scenario.py b/...t/src/managed-network/azext_managed_network/tests/latest/test_managed_network_scenario.py
@@ -108,7 +108,8 @@ def step_managednetworkslistbyresourcegroup(test, rg):
 # EXAMPLE: ManagedNetworksListBySubscription
 @try_manual
 def step_managednetworkslistbysubscription(test, rg):
-    test.cmd('az managed-network mn list',
+    test.cmd('az managed-network mn list '
+             '-g ""',
              checks=[])