Merge pull request #2431 from MikhailTryakhov/main

Added Ms.Network to schema autogeneration list

Author: jorgecotillo

generator/autogenlist.ts

@@ -13,6 +13,7 @@ import { postProcessor as securityInsightsPostProcessor } from './processors/Mic
 import { postProcessor as costManagementPostProcessor } from './processors/Microsoft.CostManagement';
 import { postProcessor as providerHubPostProcessor } from './processors/Microsoft.ProviderHub';
 import { postProcessor as mediaPostProcessor } from './processors/Microsoft.Media';
+import { postProcessor as networkPostProcessor } from './processors/Microsoft.Network';
 import { lowerCaseEquals } from './utils';
 
 // New providers are onboarded by default. The providers listed here are the only ones **not** onboarded.
@@ -42,6 +43,7 @@ const disabledProviders: AutoGenConfig[] = [
         basePath: 'dns/resource-manager',
         namespace: 'Microsoft.Network',
         disabledForAutogen: true,
+        suffix: 'DNS',
     },
     {
         // Disabled as the swagger spec contains a bug (enum mismatch)
@@ -59,11 +61,6 @@ const disabledProviders: AutoGenConfig[] = [
         namespace: 'Microsoft.ManagedServices',
         disabledForAutogen: true,
     },
-    {
-        basePath: 'network/resource-manager',
-        namespace: 'Microsoft.Network',
-        disabledForAutogen: true,
-    },
     {
         basePath: 'operationsmanagement/resource-manager',
         namespace: 'Microsoft.OperationsManagement',
@@ -73,6 +70,7 @@ const disabledProviders: AutoGenConfig[] = [
         basePath: 'privatedns/resource-manager',
         namespace: 'Microsoft.Network',
         disabledForAutogen: true,
+        suffix: 'privateDns',
     },
     {
         basePath: 'service-map/resource-manager',
@@ -83,6 +81,7 @@ const disabledProviders: AutoGenConfig[] = [
         basePath: 'trafficmanager/resource-manager',
         namespace: 'Microsoft.Network',
         disabledForAutogen: true,
+        suffix: 'trafficManager',
     },
     {
         basePath: 'videoanalyzer/resource-manager',
@@ -1046,6 +1045,12 @@ const autoGenList: AutoGenConfig[] = [
         postProcessor: mediaPostProcessor
     },
     {
+        basePath: 'network/resource-manager',
+        namespace: 'Microsoft.Network',
+		postProcessor: networkPostProcessor,
+        suffix: 'NRP'
+    },
+	{
         basePath: 'dnsresolver/resource-manager',
         namespace: 'Microsoft.Network',
         suffix: 'DnsResolver',

generator/processors/Microsoft.Network.ts

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+import { SchemaPostProcessor } from '../models';
+import { replaceCyclicRef } from './helpers';
+
+export const postProcessor: SchemaPostProcessor = async (namespace, apiVersion, schema) => {
+  replaceCyclicRef(schema.definitions?.NetworkInterfaceIPConfigurationPropertiesFormat?.properties?.virtualNetworkTaps?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.NetworkInterfaceIPConfigurationPropertiesFormat?.properties?.ipConfiguration?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.NetworkInterfaceIPConfigurationPropertiesFormat?.properties?.applicationGatewayBackendAddressPools?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.ApplicationGatewayBackendAddressPoolPropertiesFormat?.properties?.backendIPConfigurations?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.RouteFilterPropertiesFormat?.properties?.peerings?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.Ipv6ExpressRouteCircuitPeeringConfig?.properties?.routeFilter?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.PublicIPAddressPropertiesFormat?.properties?.linkedPublicIPAddress?.oneOf[0]);
+  replaceCyclicRef(schema.definitions?.PublicIPAddressPropertiesFormat?.properties?.servicePublicIPAddress?.oneOf[0]);
+  replaceCyclicRef(schema.definitions?.ContainerNetworkInterfaceConfigurationPropertiesFormat?.properties?.containerNetworkInterfaces?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.NetworkInterfacePropertiesFormat?.properties?.ipConfigurations?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.CustomIpPrefixPropertiesFormat?.properties?.customIpPrefixParent?.oneOf[0]);
+  replaceCyclicRef(schema.definitions?.NetworkInterfacePropertiesFormat?.properties?.networkSecurityGroup?.oneOf[0]);
+  replaceCyclicRef(schema.definitions?.NetworkSecurityGroupPropertiesFormat?.properties?.subnets?.oneOf[0].items);
+  replaceCyclicRef(schema.definitions?.PublicIPAddressPropertiesFormat?.properties?.ipConfiguration?.oneOf[0]);
+  replaceCyclicRef(schema.definitions?.RouteTablePropertiesFormat?.properties?.subnets?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.SubnetPropertiesFormat?.properties?.ipConfigurations?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.BackendAddressPoolPropertiesFormat?.properties?.backendIPConfigurations?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.InboundNatRulePropertiesFormat?.properties?.backendIPConfiguration?.oneOf[0]);
+}