extension mode configurable

readme.az.common.md

@@ -1,6 +1,7 @@
 # configuration for az common
 
 ``` yaml $(az)
+extension-mode: experimental
 
 cli:
     naming:

src/plugins/azgenerator/CodeModelAz.ts

@@ -65,6 +65,7 @@ export interface CodeModelAz
     Extension_TestScenario: any;
     Extension_ClientSubscriptionBound: boolean;
     Extension_ClientBaseUrlBound: boolean;
+    Extension_Mode: string;
 
     SelectFirstCommandGroup(): boolean;
     SelectNextCommandGroup(): boolean;

src/plugins/azgenerator/CodeModelAzImpl.ts

@@ -403,7 +403,11 @@ export class CodeModelCliImpl implements CodeModelAz {
     public get Extension_Name() {
         return this.extensionName;
     }
-
+
+    public get Extension_Mode() {
+        return this.codeModel.info['extensionMode'];
+    }
+
     public get Extension_NameUnderscored() {
         return this.extensionName.replace(/-/g, '_');
     }

src/plugins/azgenerator/TemplateAzureCliAzextMetadata.ts

@@ -9,7 +9,12 @@ export function GenerateAzureCliAzextMetadata(model: CodeModelAz) : string[] {
     var output: string[] = [];
 
     output.push('{');
-    output.push('    "azext.isExperimental": true,');
+    if(model.Extension_Mode == 'experimental') {
+        output.push('    "azext.isExperimental": true,');
+    } else if(model.Extension_Mode == 'preview') {
+        output.push('    "azext.isPreview": true,');
+    }
+
     output.push('    "azext.minCliCoreVersion": "2.3.1"');
     output.push('}');
 

src/plugins/azgenerator/TemplateAzureCliCommands.ts

@@ -37,7 +37,7 @@ export function GenerateAzureCliCommands(model: CodeModelAz): string[] {
                 output.push("        client_factory=" + cf_name + ")");
                 let groupinfos = model.CommandGroup_Name.split(' ');
                 let extraInfo = "";
-                if(groupinfos.length == 2) {
+                if(groupinfos.length == 2 && model.Extension_Mode == 'experimental') {
                     extraInfo = ", is_experimental=True";
                 }
                 ToMultiLine("    with self.command_group('" + model.CommandGroup_Name + "', " + model.Extension_NameUnderscored + "_" + model.GetModuleOperationName() + ", client_factory=" + cf_name + extraInfo + ") as g:", output);

src/plugins/azgenerator/TemplateAzureCliCustom.ts

@@ -28,6 +28,10 @@ export function GenerateAzureCliCustom(model: CodeModelAz): string[] {
         header.addFromImport("knack.util", ["CLIError"]);
     }
 
+    if(required['nowait']) {
+        header.addFromImport("azure.cli.core.util", ["sdk_no_wait"]);
+    }
+
     let output = [];
     output = output.concat(body);
     output.push("");
@@ -136,7 +140,7 @@ function ConstructMethodBodyParameter(model: CodeModelAz, needGeneric: boolean =
     return output_body;
 }
 
-function GetSingleCommandDef(model: CodeModelAz, originalOperation: Operation, needUpdate: boolean = false, needGeneric: boolean = false) {
+function GetSingleCommandDef(model: CodeModelAz, required: any, originalOperation: Operation, needUpdate: boolean = false, needGeneric: boolean = false) {
 
     let output: string[] = [];
     let updatedMethodName: string = model.Command_FunctionName;
@@ -153,9 +157,13 @@ function GetSingleCommandDef(model: CodeModelAz, originalOperation: Operation, n
     output.push(call);
 
     let allParam: Map<string, boolean> = new Map<string, boolean>();
+    let hasLongRun = false;
     if (model.SelectFirstMethod()) {
         do {
-
+            if(model.Method_IsLongRun) {
+                required['nowait'] = true,
+                hasLongRun = true;
+            }
             if (model.SelectFirstMethodParameter()) {
                 do {
                     if (model.MethodParameter_IsFlattened) {
@@ -222,6 +230,10 @@ function GetSingleCommandDef(model: CodeModelAz, originalOperation: Operation, n
         } while (model.SelectNextMethod());
     }
 
+    if(hasLongRun) {
+        output[output.length - 1] += ",";
+        output.push(indent + "no_wait=False");
+    }
     output[output.length - 1] += "):";
     return output;
 }
@@ -357,13 +369,13 @@ function GetSingleCommandBody(model: CodeModelAz, required, originalOperation: O
     return output;
 }
 
-function GetCommandBody(model: CodeModelAz, required: boolean, needUpdate: boolean = false, originalOperation: Operation = null, needGeneric: boolean = false) {
+function GetCommandBody(model: CodeModelAz, required: any, needUpdate: boolean = false, originalOperation: Operation = null, needGeneric: boolean = false) {
     // create, delete, list, show, update
     let output: string[] = [];
     output.push("");
     output.push("");
 
-    output = output.concat(GetSingleCommandDef(model, originalOperation, needUpdate, needGeneric));
+    output = output.concat(GetSingleCommandDef(model, required, originalOperation, needUpdate, needGeneric));
     output = output.concat(GetSingleCommandBody(model, required, originalOperation, needGeneric))
     return output;
 }
@@ -374,8 +386,11 @@ function GetPolyMethodCall(model: CodeModelAz, prefix: any, originalOperation: O
     let methodName = originalOperation.language['python'].name;
     if (model.Method_IsLongRun) {
         methodName = "begin_" + methodName;
+        methodCall += "sdk_no_wait(no_wait, " + "client." + methodName;
+    } else {
+        methodCall += "client." + methodName + "(";
     }
-    methodCall += "client." + methodName + "(";
+
 
     let indent = " ".repeat(methodCall.length);
     let cnt = 0;
@@ -424,8 +439,11 @@ function GetMethodCall(model: CodeModelAz, prefix: any): string[] {
     let methodName = model.Method_Name;
     if (model.Method_IsLongRun) {
         methodName = "begin_" + methodName;
+        methodCall += "sdk_no_wait(no_wait, " + "client." + methodName;
+    } else {
+        methodCall += "client." + methodName + "(";
     }
-    methodCall += "client." + methodName + "(";
+
 
     let indent = " ".repeat(methodCall.length); 
     if (model.SelectFirstMethodParameter()) {

src/plugins/merger.ts

@@ -32,12 +32,14 @@ export class Merger {
 
 export async function processRequest(host: Host) {
     const debug = await host.GetValue('debug') || false;
+    const extensionMode = await host.GetValue('extension-mode');
     //host.Message({Channel:Channel.Warning, Text:"in aznamer processRequest"});
 
     //console.error(extensionName);
     try {
         const session = await startSession<CodeModel>(host, {}, codeModelSchema);
         const plugin = await new Merger(session);
+        plugin.codeModel.info['extensionMode'] = extensionMode;
         const result = await plugin.process();
         host.WriteFile('azmerger-temp-output.yaml', serialize(result));
     } catch (E) {

src/test/scenarios/managed-network/configuration/readme.az.md

@@ -11,6 +11,7 @@ az:
 az-output-folder: $(azure-cli-extension-folder)/src/managed-network
 python-sdk-output-folder: $(az-output-folder)/azext_managed_network/vendored_sdks/managednetwork
 
+extension-mode: preview
 
 directive:
     - where:

src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/azext_metadata.json

@@ -1,4 +1,4 @@
 {
-    "azext.isExperimental": true,
+    "azext.isPreview": true,
     "azext.minCliCoreVersion": "2.3.1"
 }

src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/commands.py

@@ -18,8 +18,7 @@ def load_command_table(self, _):
         operations_tmpl='azext_managed_network.vendored_sdks.managednetwork.operations._managed_network_operations#Mana'
         'gedNetworkOperations.{}',
         client_factory=cf_mn)
-    with self.command_group('managed-network mn', managed_network_mn, client_factory=cf_mn,
-                            is_experimental=True) as g:
+    with self.command_group('managed-network mn', managed_network_mn, client_factory=cf_mn) as g:
         g.custom_command('list', 'managed_network_mn_list')
         g.custom_show_command('show', 'managed_network_mn_show')
         g.custom_command('create', 'managed_network_mn_create')
@@ -61,7 +60,7 @@ def load_command_table(self, _):
         client_factory=cf_managed_network_peering_policy)
     with self.command_group('managed-network managed-network-peering-policy',
                             managed_network_managed_network_peering_policy,
-                            client_factory=cf_managed_network_peering_policy, is_experimental=True) as g:
+                            client_factory=cf_managed_network_peering_policy) as g:
         g.custom_command('list', 'managed_network_managed_network_peering_policy_list')
         g.custom_show_command('show', 'managed_network_managed_network_peering_policy_show')
         g.custom_command('hub-and-spoke-topology create', 'managed_network_managed_network_peering_policy_hub_and_spoke'