Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Resource TeamsMeetingPolicy #294

Merged
merged 7 commits into from
Dec 9, 2019
Merged

New Resource TeamsMeetingPolicy #294

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cccadc6
Initial
NikCharlebois Dec 6, 2019
ddba9d0
Merge remote-tracking branch 'upstream/dev' into TeamsMeetingPolicy
NikCharlebois Dec 6, 2019
329e281
Added Tests
NikCharlebois Dec 6, 2019
197b17c
Fixes
NikCharlebois Dec 6, 2019
1ac022d
Unit Test Fixes
NikCharlebois Dec 7, 2019
be4b783
Update MSFT_TeamsMeetingPolicy.schema.mof
NikCharlebois Dec 8, 2019
faa85d0
Merge remote-tracking branch 'upstream/dev' into TeamsMeetingPolicy
NikCharlebois Dec 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added Tests
  • Loading branch information
@NikCharlebois
NikCharlebois committed Dec 6, 2019
commit 329e281dd103ef66e3fb141411bede876450c26f
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
* Initial Release;
* TeamsClientConfiguration
* Initial Release;
* TeamsMeetingPolicy
* Initial Release;
* TeamsUpgradeConfiguration
* Initial Release;
* TeamsUser
Expand Down
42 changes: 42 additions & 0 deletions Modules/Office365DSC/Examples/Resources/TeamsMeetingPolicy/1-AddNewMeetingPolicy.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<#
This example adds a new Teams Meeting Policy.
#>

Configuration Example
{
param(
[Parameter(Mandatory = $true)]
[PSCredential]
$credsGlobalAdmin
)
Import-DscResource -ModuleName Office365DSC

node localhost
{
TeamsMeetingPolicy DemoMeetingPolicy
{
AllowAnonymousUsersToDialOut = $False;
AllowAnonymousUsersToStartMeeting = $False;
AllowChannelMeetingScheduling = $True;
AllowCloudRecording = $True;
AllowExternalParticipantGiveRequestControl = $False;
AllowIPAudio = $True;
AllowIPVideo = $True;
AllowMeetNow = $True;
AllowOutlookAddIn = $True;
AllowParticipantGiveRequestControl = $True;
AllowPowerPointSharing = $True;
AllowPrivateMeetingScheduling = $True;
AllowSharedNotes = $True;
AllowTranscription = $False;
AllowWhiteboard = $True;
AutoAdmittedUsers = "Everyone";
Description = "My Demo Meeting Policy";
Ensure = "Present";
GlobalAdminAccount = $credsglobaladmin;
Identity = "Demo Policy";
MediaBitRateKb = 50000;
ScreenSharingMode = "EntireScreen";
}
}
}
16 changes: 12 additions & 4 deletions Modules/Office365DSC/Modules/O365DSCReverseGUI.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ function Show-O365GUI
$pnlTeams = New-Object System.Windows.Forms.Panel
$pnlTeams.Top = 88 + $topBannerHeight
$pnlTeams.Left = $ThirdColumnLeft
$pnlTeams.Height = 160
$pnlTeams.Height = 180
$pnlTeams.Width = 300
$pnlTeams.BorderStyle = [System.Windows.Forms.BorderStyle]::FixedSingle

Expand Down Expand Up @@ -686,24 +686,32 @@ function Show-O365GUI
$chckTeamsMeetingPolicy.Text = "Meeting Policies"
$pnlTeams.Controls.Add($chckTeamsMeetingPolicy)

$chckTeamsMessagingPolicy = New-Object System.Windows.Forms.CheckBox
$chckTeamsMessagingPolicy.Top = 100
$chckTeamsMessagingPolicy.AutoSize = $true;
$chckTeamsMessagingPolicy.Name = "chckTeamsMessagingPolicy"
$chckTeamsMessagingPolicy.Checked = $true
$chckTeamsMessagingPolicy.Text = "Messaging Policies"
$pnlTeams.Controls.Add($chckTeamsMessagingPolicy)

$chckTeamsTeam = New-Object System.Windows.Forms.CheckBox
$chckTeamsTeam.Top = 100
$chckTeamsTeam.Top = 120
$chckTeamsTeam.AutoSize = $true;
$chckTeamsTeam.Name = "chckTeamsTeam"
$chckTeamsTeam.Checked = $true
$chckTeamsTeam.Text = "Teams"
$pnlTeams.Controls.Add($chckTeamsTeam)

$chckTeamsUpgradePolicy = New-Object System.Windows.Forms.CheckBox
$chckTeamsUpgradePolicy.Top = 120
$chckTeamsUpgradePolicy.Top = 140
$chckTeamsUpgradePolicy.AutoSize = $true;
$chckTeamsUpgradePolicy.Name = "chckTeamsUpgradePolicy"
$chckTeamsUpgradePolicy.Checked = $true
$chckTeamsUpgradePolicy.Text = "Upgrade Policies"
$pnlTeams.Controls.Add($chckTeamsUpgradePolicy)

$chckTeamsUser = New-Object System.Windows.Forms.CheckBox
$chckTeamsUser.Top = 140
$chckTeamsUser.Top = 160
$chckTeamsUser.AutoSize = $true;
$chckTeamsUser.Name = "chckTeamsUser"
$chckTeamsUser.Checked = $true
Expand Down
26 changes: 26 additions & 0 deletions Tests/Integration/O365Integration.Master.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,32 @@ Configuration Master
Identity = "Integration Channel Policy";
}

TeamsMeetingPolicy DemoMeetingPolicy
{
AllowAnonymousUsersToDialOut = $False;
AllowAnonymousUsersToStartMeeting = $False;
AllowChannelMeetingScheduling = $True;
AllowCloudRecording = $True;
AllowExternalParticipantGiveRequestControl = $False;
AllowIPAudio = $True;
AllowIPVideo = $True;
AllowMeetNow = $True;
AllowOutlookAddIn = $True;
AllowParticipantGiveRequestControl = $True;
AllowPowerPointSharing = $True;
AllowPrivateMeetingScheduling = $True;
AllowSharedNotes = $True;
AllowTranscription = $False;
AllowWhiteboard = $True;
AutoAdmittedUsers = "Everyone";
Description = "Integration Meeting Policy";
Ensure = "Present";
GlobalAdminAccount = $GlobalAdmin;
Identity = "Integration Meeting Policy";
MediaBitRateKb = 50000;
ScreenSharingMode = "EntireScreen";
}

TeamsTeam TeamAlpha
{
DisplayName = "Alpha Team"
Expand Down
Loading