neon tsp

Author: AllyW

src/neon/azext_neon/aaz/latest/neon/postgres/_create.py

@@ -57,7 +57,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
             ),
         )
         _args_schema.resource_group = AAZResourceGroupNameArg(
-            help="Name of the resource group",
             required=True,
         )
 

src/neon/azext_neon/aaz/latest/neon/postgres/organization/_delete.py

@@ -59,7 +59,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
             ),
         )
         _args_schema.resource_group = AAZResourceGroupNameArg(
-            help="Name of the resource group",
             required=True,
         )
         return cls._args_schema

src/neon/azext_neon/aaz/latest/neon/postgres/organization/_list.py

@@ -47,19 +47,17 @@ def _build_arguments_schema(cls, *args, **kwargs):
         # define Arg Group ""
 
         _args_schema = cls._args_schema
-        _args_schema.resource_group = AAZResourceGroupNameArg(
-            help="Name of the resource group",
-        )
+        _args_schema.resource_group = AAZResourceGroupNameArg()
         return cls._args_schema
 
     def _execute_operations(self):
         self.pre_operations()
-        condition_0 = has_value(self.ctx.args.resource_group) and has_value(self.ctx.subscription_id)
-        condition_1 = has_value(self.ctx.subscription_id) and has_value(self.ctx.args.resource_group) is not True
+        condition_0 = has_value(self.ctx.subscription_id) and has_value(self.ctx.args.resource_group) is not True
+        condition_1 = has_value(self.ctx.args.resource_group) and has_value(self.ctx.subscription_id)
         if condition_0:
-            self.OrganizationsListByResourceGroup(ctx=self.ctx)()
-        if condition_1:
             self.OrganizationsListBySubscription(ctx=self.ctx)()
+        if condition_1:
+            self.OrganizationsListByResourceGroup(ctx=self.ctx)()
         self.post_operations()
 
     @register_callback
@@ -75,7 +73,7 @@ def _output(self, *args, **kwargs):
         next_link = self.deserialize_output(self.ctx.vars.instance.next_link)
         return result, next_link
 
-    class OrganizationsListByResourceGroup(AAZHttpOperation):
+    class OrganizationsListBySubscription(AAZHttpOperation):
         CLIENT_TYPE = "MgmtClient"
 
         def __call__(self, *args, **kwargs):
@@ -89,7 +87,7 @@ def __call__(self, *args, **kwargs):
         @property
         def url(self):
             return self.client.format_url(
-                "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Neon.Postgres/organizations",
+                "/subscriptions/{subscriptionId}/providers/Neon.Postgres/organizations",
                 **self.url_parameters
             )
 
@@ -104,10 +102,6 @@ def error_format(self):
         @property
         def url_parameters(self):
             parameters = {
-                **self.serialize_url_param(
-                    "resourceGroupName", self.ctx.args.resource_group,
-                    required=True,
-                ),
                 **self.serialize_url_param(
                     "subscriptionId", self.ctx.subscription_id,
                     required=True,
@@ -323,7 +317,7 @@ def _build_schema_on_200(cls):
 
             return cls._schema_on_200
 
-    class OrganizationsListBySubscription(AAZHttpOperation):
+    class OrganizationsListByResourceGroup(AAZHttpOperation):
         CLIENT_TYPE = "MgmtClient"
 
         def __call__(self, *args, **kwargs):
@@ -337,7 +331,7 @@ def __call__(self, *args, **kwargs):
         @property
         def url(self):
             return self.client.format_url(
-                "/subscriptions/{subscriptionId}/providers/Neon.Postgres/organizations",
+                "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Neon.Postgres/organizations",
                 **self.url_parameters
             )
 
@@ -352,6 +346,10 @@ def error_format(self):
         @property
         def url_parameters(self):
             parameters = {
+                **self.serialize_url_param(
+                    "resourceGroupName", self.ctx.args.resource_group,
+                    required=True,
+                ),
                 **self.serialize_url_param(
                     "subscriptionId", self.ctx.subscription_id,
                     required=True,

src/neon/azext_neon/aaz/latest/neon/postgres/organization/_show.py

@@ -57,7 +57,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
             ),
         )
         _args_schema.resource_group = AAZResourceGroupNameArg(
-            help="Name of the resource group",
             required=True,
         )
         return cls._args_schema