@@ -968,7 +968,7 @@ public Model.NodeConfiguration GetNodeConfiguration(string resourceGroupName, st
968
968
{
969
969
var nodeConfiguration = this . automationManagementClient . DscNodeConfiguration . Get ( resourceGroupName , automationAccountName , nodeConfigurationName ) ;
970
970
971
- string computedRollupStatus = GetRollupStatus ( resourceGroupName , automationAccountName , nodeConfigurationName ) ;
971
+ string computedRollupStatus = GetRollupStatus ( resourceGroupName , automationAccountName , null ) ;
972
972
973
973
if ( string . IsNullOrEmpty ( rollupStatus ) || ( rollupStatus != null && computedRollupStatus . Equals ( rollupStatus ) ) )
974
974
{
@@ -1444,7 +1444,7 @@ public Model.DscNodeReport GetLatestDscNodeReport(string resourceGroupName, stri
1444
1444
resourceGroupName ,
1445
1445
automationAccountName ,
1446
1446
nodeId . ToString ( ) ,
1447
- this . GetNodeReportListFilterString ( nodeId , startTime , endTime ) ) ;
1447
+ this . GetNodeReportListFilterString ( null , startTime , endTime , null ) ) ;
1448
1448
}
1449
1449
else
1450
1450
{
@@ -1711,7 +1711,7 @@ private string GetNodeListFilterString(string status, string nodeName)
1711
1711
return filter ;
1712
1712
}
1713
1713
1714
- private string GetNodeReportListFilterString ( Guid nodeId , DateTimeOffset ? startTime , DateTimeOffset ? endTime )
1714
+ private string GetNodeReportListFilterString ( string type , DateTimeOffset ? startTime , DateTimeOffset ? endTime , DateTimeOffset ? lastModifiedTime )
1715
1715
{
1716
1716
string filter = null ;
1717
1717
List < string > odataFilter = new List < string > ( ) ;
@@ -1723,9 +1723,13 @@ private string GetNodeReportListFilterString(Guid nodeId, DateTimeOffset? startT
1723
1723
{
1724
1724
odataFilter . Add ( "properties/endTime le " + this . FormatDateTime ( endTime . Value ) ) ;
1725
1725
}
1726
- if ( nodeId != null )
1726
+ if ( string . IsNullOrWhiteSpace ( type ) )
1727
1727
{
1728
- odataFilter . Add ( "properties/nodeId eq '" + Uri . EscapeDataString ( nodeId . ToString ( ) ) + "'" ) ;
1728
+ odataFilter . Add ( "properties/type eq '" + Uri . EscapeDataString ( type ) + "'" ) ;
1729
+ }
1730
+ if ( lastModifiedTime . HasValue )
1731
+ {
1732
+ odataFilter . Add ( "properties/lastModifiedTime ge " + this . FormatDateTime ( startTime . Value ) ) ;
1729
1733
}
1730
1734
if ( odataFilter . Count > 0 )
1731
1735
{
0 commit comments