@@ -2878,103 +2878,142 @@ def show_vm_nic(cmd, resource_group_name, vm_name, nic):
28782878
28792879 NicShow = import_aaz_by_profile (cmd .cli_ctx .cloud .profile , "network.nic" ).Show
28802880
2881- vm = get_vm (cmd , resource_group_name , vm_name )
2881+ vm = get_vm_by_aaz (cmd , resource_group_name , vm_name ) or {}
2882+ nics = (vm .get ('networkProfile' ) or {}).get ('networkInterfaces' ) or []
2883+
2884+ nic_in = (nic or "" ).strip ()
2885+ nic_in_lower = nic_in .lower ()
2886+
2887+ def _safe_id (item ):
2888+ _id = item .get ('id' ) if isinstance (item , dict ) else None
2889+ return _id .strip () if isinstance (_id , str ) else None
2890+
28822891 found = next (
2883- (n for n in vm . network_profile . network_interfaces if nic .lower () == n . id . lower ()), None
2884- # pylint: disable=no-member
2892+ (n for n in nics if ( _safe_id ( n ) or "" ) .lower () == nic_in_lower ),
2893+ None
28852894 )
2886- if found :
2887- nic_name = parse_resource_id (found .id )['name' ]
2888- return NicShow (cli_ctx = cmd .cli_ctx )(command_args = {
2889- 'name' : nic_name ,
2890- 'resource_group' : resource_group_name
2891- })
2892- raise CLIError ("NIC '{}' not found on VM '{}'" .format (nic , vm_name ))
2895+
2896+ if not found :
2897+ raise CLIError ("NIC '{}' not found on VM '{}'" .format (nic , vm_name ))
2898+
2899+ found_id = _safe_id (found )
2900+ if not found_id :
2901+ raise CLIError ("NIC '{}' not found on VM '{}'" .format (nic , vm_name ))
2902+
2903+ nic_name = parse_resource_id (found_id )['name' ]
2904+ return NicShow (cli_ctx = cmd .cli_ctx )(command_args = {
2905+ 'name' : nic_name ,
2906+ 'resource_group' : resource_group_name
2907+ })
28932908
28942909
28952910def list_vm_nics (cmd , resource_group_name , vm_name ):
2896- vm = get_vm (cmd , resource_group_name , vm_name )
2897- return vm .network_profile .network_interfaces # pylint: disable=no-member
2911+ vm = get_vm_by_aaz (cmd , resource_group_name , vm_name ) or {}
2912+ nics = (vm .get ('networkProfile' ) or {}).get ('networkInterfaces' ) or []
2913+
2914+ normalized = []
2915+ for nic in nics :
2916+ nic = nic or {}
2917+ normalized .append ({
2918+ "id" : nic .get ("id" ),
2919+ "resourceGroup" : nic .get ("resourceGroup" ) or resource_group_name ,
2920+ "primary" : nic .get ("primary" ),
2921+ "deleteOption" : nic .get ("deleteOption" ),
2922+ })
2923+ return normalized
28982924
28992925
29002926def add_vm_nic (cmd , resource_group_name , vm_name , nics , primary_nic = None ):
2901- vm = get_vm_to_update (cmd , resource_group_name , vm_name )
2927+ from .operations .vm import convert_show_result_to_snake_case as to_snake_case
2928+
2929+ vm = to_snake_case (get_vm_by_aaz (cmd , resource_group_name , vm_name ) or {}) or {}
29022930 new_nics = _build_nic_list (cmd , nics )
29032931 existing_nics = _get_existing_nics (vm )
2904- return _update_vm_nics (cmd , vm , existing_nics + new_nics , primary_nic )
2932+
2933+ return _update_vm_nics (
2934+ cmd , vm , existing_nics + new_nics , primary_nic ,
2935+ resource_group_name = resource_group_name ,
2936+ vm_name = vm_name )
29052937
29062938
29072939def remove_vm_nic (cmd , resource_group_name , vm_name , nics , primary_nic = None ):
2940+ from .operations .vm import convert_show_result_to_snake_case as to_snake_case
29082941
2909- def to_delete (nic_id ):
2910- return [n for n in nics_to_delete if n .id .lower () == nic_id .lower ()]
2942+ vm = to_snake_case (get_vm_by_aaz (cmd , resource_group_name , vm_name ) or {}) or {}
29112943
2912- vm = get_vm_to_update (cmd , resource_group_name , vm_name )
29132944 nics_to_delete = _build_nic_list (cmd , nics )
29142945 existing_nics = _get_existing_nics (vm )
2915- survived = [x for x in existing_nics if not to_delete (x .id )]
2916- return _update_vm_nics (cmd , vm , survived , primary_nic )
2946+
2947+ delete_ids = {n ["id" ].lower () for n in nics_to_delete if n .get ("id" )}
2948+
2949+ survived = [x for x in existing_nics if (x .get ("id" ) or "" ).lower () not in delete_ids ]
2950+ return _update_vm_nics (
2951+ cmd , vm , survived , primary_nic ,
2952+ resource_group_name = resource_group_name ,
2953+ vm_name = vm_name )
29172954
29182955
29192956def set_vm_nic (cmd , resource_group_name , vm_name , nics , primary_nic = None ):
2920- vm = get_vm_to_update (cmd , resource_group_name , vm_name )
2921- nics = _build_nic_list (cmd , nics )
2922- return _update_vm_nics (cmd , vm , nics , primary_nic )
2957+ from .operations .vm import convert_show_result_to_snake_case as to_snake_case
2958+
2959+ vm = to_snake_case (get_vm_by_aaz (cmd , resource_group_name , vm_name ) or {}) or {}
2960+ nic_list = _build_nic_list (cmd , nics )
2961+
2962+ return _update_vm_nics (
2963+ cmd , vm , nic_list , primary_nic ,
2964+ resource_group_name = resource_group_name ,
2965+ vm_name = vm_name ,
2966+ )
29232967
29242968
29252969def _build_nic_list (cmd , nic_ids ):
29262970 NicShow = import_aaz_by_profile (cmd .cli_ctx .cloud .profile , "network.nic" ).Show
2927-
2928- NetworkInterfaceReference = cmd .get_models ('NetworkInterfaceReference' )
29292971 nic_list = []
29302972 if nic_ids :
2931- # pylint: disable=no-member
29322973 for nic_id in nic_ids :
29332974 rg , name = _parse_rg_name (nic_id )
2934- nic = NicShow (cli_ctx = cmd .cli_ctx )(command_args = {
2935- 'name' : name ,
2936- 'resource_group' : rg
2937- })
2938- nic_list .append (NetworkInterfaceReference (id = nic ['id' ], primary = False ))
2975+ nic = NicShow (cli_ctx = cmd .cli_ctx )(command_args = {'name' : name , 'resource_group' : rg })
2976+ nic_list .append ({"id" : nic ["id" ], "primary" : False })
29392977 return nic_list
29402978
29412979
29422980def _get_existing_nics (vm ):
2943- network_profile = getattr (vm , 'network_profile' , None )
2944- nics = []
2945- if network_profile is not None :
2946- nics = network_profile .network_interfaces or []
2947- return nics
2948-
2981+ return (vm .get ("network_profile" ) or {}).get ("network_interfaces" ) or []
29492982
2950- def _update_vm_nics (cmd , vm , nics , primary_nic ):
2951- NetworkProfile = cmd .get_models ('NetworkProfile' )
29522983
2984+ def _update_vm_nics (cmd , vm , nics , primary_nic , resource_group_name , vm_name ):
29532985 if primary_nic :
29542986 try :
29552987 _ , primary_nic_name = _parse_rg_name (primary_nic )
29562988 except IndexError :
29572989 primary_nic_name = primary_nic
29582990
2959- matched = [n for n in nics if _parse_rg_name (n . id )[1 ].lower () == primary_nic_name .lower ()]
2991+ matched = [n for n in nics if _parse_rg_name (n [ "id" ] )[1 ].lower () == primary_nic_name .lower ()]
29602992 if not matched :
2961- raise CLIError ('Primary Nic {} is not found' . format ( primary_nic ) )
2993+ raise CLIError (f 'Primary Nic { primary_nic }
29622994 if len (matched ) > 1 :
2963- raise CLIError ('Duplicate Nic entries with name {}' . format ( primary_nic ) )
2995+ raise CLIError (f 'Duplicate Nic entries with name { primary_nic } '
29642996 for n in nics :
2965- n . primary = False
2966- matched [0 ]. primary = True
2997+ n [ " primary" ] = False
2998+ matched [0 ][ " primary" ] = True
29672999 elif nics :
2968- if not [ n for n in nics if n . primary ] :
2969- nics [0 ]. primary = True
3000+ if not any ( n . get ( "primary" ) for n in nics ) :
3001+ nics [0 ][ " primary" ] = True
29703002
2971- network_profile = getattr (vm , 'network_profile' , None )
2972- if network_profile is None :
2973- vm .network_profile = NetworkProfile (network_interfaces = nics )
2974- else :
2975- network_profile .network_interfaces = nics
3003+ vm .setdefault ("network_profile" , {})
3004+ vm ["network_profile" ]["network_interfaces" ] = nics
3005+
3006+ vm .pop ("resources" , None )
3007+
3008+ vm ["resource_group" ] = resource_group_name
3009+ vm ["vm_name" ] = vm_name
3010+
3011+ from .operations .vm import VMCreate
3012+
3013+ poller = VMCreate (cli_ctx = cmd .cli_ctx )(command_args = vm )
3014+ result = LongRunningOperation (cmd .cli_ctx )(poller )
29763015
2977- return set_vm ( cmd , vm ). network_profile . network_interfaces
3016+ return ( result . get ( "networkProfile" ) or {}). get ( "networkInterfaces" ) or []
29783017# endregion
29793018
29803019
0 commit comments