@@ -2376,6 +2376,7 @@ private Provider getNetworkOfferingProvider(NetworkOffering networkOffering) {
23762376 @ Override
23772377 public Pair <List <? extends Network >, Integer > searchForNetworks (ListNetworksCmd cmd ) {
23782378 Long id = cmd .getId ();
2379+ String name = cmd .getName ();
23792380 String keyword = cmd .getKeyword ();
23802381 Long zoneId = cmd .getZoneId ();
23812382 Account caller = CallContext .current ().getCallingAccount ();
@@ -2554,7 +2555,7 @@ public Pair<List<? extends Network>, Integer> searchForNetworks(ListNetworksCmd
25542555
25552556 Pair <List <NetworkVO >, Integer > result = new Pair <>(new ArrayList <>(), 0 );
25562557 if (BooleanUtils .isTrue (isSystem )) {
2557- SearchCriteria <NetworkVO > sc = createNetworkSearchCriteria (sb , keyword , id , isSystem , zoneId , guestIpType , trafficType ,
2558+ SearchCriteria <NetworkVO > sc = createNetworkSearchCriteria (sb , name , keyword , id , isSystem , zoneId , guestIpType , trafficType ,
25582559 physicalNetworkId , networkOfferingId , null , restartRequired , specifyIpRanges ,
25592560 vpcId , tags , display , vlanId , associatedNetworkId );
25602561 addProjectNetworksConditionToSearch (sc , true );
@@ -2567,7 +2568,7 @@ public Pair<List<? extends Network>, Integer> searchForNetworks(ListNetworksCmd
25672568 addSharedNetworksToSearch (additionalSC , sb , networkFilter , permittedAccounts , path , isRecursive );
25682569
25692570 if (CollectionUtils .isNotEmpty (additionalSC .getValues ())) {
2570- SearchCriteria <NetworkVO > sc = createNetworkSearchCriteria (sb , keyword , id , isSystem , zoneId , guestIpType ,
2571+ SearchCriteria <NetworkVO > sc = createNetworkSearchCriteria (sb , name , keyword , id , isSystem , zoneId , guestIpType ,
25712572 trafficType , physicalNetworkId , networkOfferingId , aclType , restartRequired , specifyIpRanges , vpcId ,
25722573 tags , display , vlanId , associatedNetworkId );
25732574 sc .addAnd ("id" , SearchCriteria .Op .SC , additionalSC );
@@ -2680,7 +2681,7 @@ private void addSharedNetworksToSearch(SearchCriteria<NetworkVO> additionalSC, S
26802681 }
26812682 }
26822683
2683- private SearchCriteria <NetworkVO > createNetworkSearchCriteria (SearchBuilder <NetworkVO > sb , String keyword , Long id ,
2684+ private SearchCriteria <NetworkVO > createNetworkSearchCriteria (SearchBuilder <NetworkVO > sb , String name , String keyword , Long id ,
26842685 Boolean isSystem , Long zoneId , String guestIpType , String trafficType , Long physicalNetworkId ,
26852686 Long networkOfferingId , String aclType , Boolean restartRequired ,
26862687 Boolean specifyIpRanges , Long vpcId , Map <String , String > tags , Boolean display , String vlanId , Long associatedNetworkId ) {
@@ -2691,6 +2692,10 @@ private SearchCriteria<NetworkVO> createNetworkSearchCriteria(SearchBuilder<Netw
26912692 sc .setJoinParameters ("networkOfferingSearch" , "systemOnly" , isSystem );
26922693 }
26932694
2695+ if (name != null ) {
2696+ sc .addAnd ("name" , SearchCriteria .Op .EQ , name );
2697+ }
2698+
26942699 if (keyword != null ) {
26952700 SearchCriteria <NetworkVO > ssc = _networksDao .createSearchCriteria ();
26962701 ssc .addOr ("name" , SearchCriteria .Op .LIKE , "%" + keyword + "%" );
0 commit comments