Shahar Havivi has uploaded a new change for review.

Change subject: core: Sysprep - Add user specify Active Directory OU
......................................................................

core: Sysprep - Add user specify Active Directory OU

Change-Id: Ibb63316e8505affd5d78edd90881b2c7cd83e05f
Signed-off-by: Shahar Havivi <[email protected]>
---
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmInit.java
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmInitDAODbFacadeImpl.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
M 
backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
M 
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java
M packaging/conf/sysprep/sysprep.2k12x64
M packaging/conf/sysprep/sysprep.2k3
M packaging/conf/sysprep/sysprep.2k8
M packaging/conf/sysprep/sysprep.2k8x64
M packaging/conf/sysprep/sysprep.w7
M packaging/conf/sysprep/sysprep.w7x64
M packaging/conf/sysprep/sysprep.w8
M packaging/conf/sysprep/sysprep.w8x64
M packaging/conf/sysprep/sysprep.xp
A packaging/dbscripts/upgrade/03_05_0180_vm_init_add_active_directory_ou.sql
M packaging/dbscripts/vms_sp.sql
21 files changed, 76 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/26086/1

diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmInit.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmInit.java
index 7710fa5..2b7f017 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmInit.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmInit.java
@@ -13,6 +13,7 @@
     private String timeZone;
     private String authorizedKeys;
     private Boolean regenerateKeys;
+    private String ActiveDirectoryOU;
 
     private String dnsServers;
     private String dnsSearch;
@@ -172,4 +173,12 @@
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
+    public String getActiveDirectoryOU() {
+        return ActiveDirectoryOU;
+    }
+
+    public void setActiveDirectoryOU(String activeDirectoryOU) {
+        ActiveDirectoryOU = activeDirectoryOU;
+    }
 }
diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmInitDAODbFacadeImpl.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmInitDAODbFacadeImpl.java
index b463799..36aa7e3 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmInitDAODbFacadeImpl.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmInitDAODbFacadeImpl.java
@@ -73,7 +73,8 @@
                 .addValue("ui_language", vmInit.getUiLanguage())
                 .addValue("system_locale", vmInit.getSystemLocale())
                 .addValue("user_locale", vmInit.getUserLocale())
-                .addValue("user_name", vmInit.getUserName());
+                .addValue("user_name", vmInit.getUserName())
+                .addValue("active_directory_ou", vmInit.getUserName());
     }
 
     private static class VMInitRowMapper implements RowMapper<VmInit> {
@@ -100,6 +101,7 @@
             entity.setSystemLocale(rs.getString("system_locale"));
             entity.setUserLocale(rs.getString("user_locale"));
             entity.setUserName(rs.getString("user_name"));
+            entity.setUserName(rs.getString("active_directory_ou"));
 
             return entity;
         }
diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml 
b/backend/manager/modules/dal/src/test/resources/fixtures.xml
index 6858c84..bdd753c 100644
--- a/backend/manager/modules/dal/src/test/resources/fixtures.xml
+++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml
@@ -6154,6 +6154,7 @@
         <column>system_locale</column>
         <column>user_locale</column>
         <column>user_name</column>
+        <column>ad_au</column>
         <row>
             <value>77296e00-0cad-4e5a-9299-008a7b6f4354</value>
             <value>users.mydomain.com</value>
@@ -6172,6 +6173,7 @@
             <value>en_US</value>
             <value>en_US</value>
             <value>ec2</value>
+            <value></value>
         </row>
     </table>
 </dataset>
diff --git 
a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
 
b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
index 8453e0f..34795d8 100644
--- 
a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
+++ 
b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
@@ -2565,6 +2565,7 @@
         <xs:element name="system_locale" type="xs:string" minOccurs="0" 
maxOccurs="1"/>
         <xs:element name="user_locale" type="xs:string" minOccurs="0" 
maxOccurs="1"/>
         <xs:element name="user_name" type="xs:string" minOccurs="0" 
maxOccurs="1"/>
+        <xs:element name="active_directory_ou" type="xs:string" minOccurs="0" 
maxOccurs="1"/>
       </xs:sequence>
   </xs:complexType>
 
diff --git 
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
 
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
index d2ddba7..de754e7 100644
--- 
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
+++ 
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
@@ -1062,6 +1062,10 @@
         if (model.isSetUserName()) {
             entity.setUserName(model.getUserName());
         }
+
+        if (model.isSetActiveDirectoryOu()) {
+            entity.setUserName(model.getActiveDirectoryOu());
+        }
         return entity;
     }
 
@@ -1121,6 +1125,9 @@
         if (entity.getUserName() != null) {
             model.setUserName(entity.getUserName());
         }
+        if (entity.getActiveDirectoryOU() != null) {
+            model.setActiveDirectoryOu(entity.getActiveDirectoryOU());
+        }
         return model;
     }
 
diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
index 7068105..139cdeb 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
@@ -90,6 +90,7 @@
             String uiLanguage = Config.<String> 
getValue(ConfigValues.DefaultSysprepLocale);
             String systemLocale = Config.<String> 
getValue(ConfigValues.DefaultSysprepLocale);
             String userLocale = Config.<String> 
getValue(ConfigValues.DefaultSysprepLocale);
+            String activeDirectorAU = "";
 
             if (vm.getVmInit() != null) {
                 if (!StringUtils.isEmpty(vm.getVmInit().getInputLocale())) {
@@ -104,6 +105,9 @@
                 if (!StringUtils.isEmpty(vm.getVmInit().getUserLocale())) {
                     userLocale = vm.getVmInit().getUserLocale();
                 }
+                if 
(!StringUtils.isEmpty(vm.getVmInit().getActiveDirectoryOU())) {
+                    activeDirectorAU = vm.getVmInit().getActiveDirectoryOU();
+                }
             }
 
             sysPrepContent = replace(sysPrepContent, 
"$SetupUiLanguageUiLanguage$", inputLocale);
@@ -111,6 +115,7 @@
             sysPrepContent = replace(sysPrepContent, "$UiLanguage$", 
uiLanguage);
             sysPrepContent = replace(sysPrepContent, "$SystemLocale$", 
systemLocale);
             sysPrepContent = replace(sysPrepContent, "$UserLocale$", 
userLocale);
+            sysPrepContent = replace(sysPrepContent, "$MachineObjectOU$", 
activeDirectorAU);
         }
 
         return sysPrepContent;
diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
index f568437..a263c4a 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
@@ -172,6 +172,9 @@
     @DefaultStringValue("Sysprep")
     String sysprepLabel();
 
+    @DefaultStringValue("Active Directory OU")
+    String activeDirectoryOU();
+
     @DefaultStringValue("User Name")
     String cloudInitUserNameLabel();
 
diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java
index fe2ba9b..cd57876 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java
@@ -136,6 +136,11 @@
     EntityModelTextAreaEditor sysprepScriptEditor;
 
     @UiField
+    @Path(value = "activeDirectoryOU.entity")
+    @WithElementId
+    EntityModelTextBoxEditor activeDirectoryOUEditor;
+
+    @UiField
     @Path(value = "userName.entity")
     @WithElementId
     EntityModelTextBoxEditor userNameEditor;
@@ -370,6 +375,7 @@
         inputLocaleEditor.setLabel(constants.inputLocaleLabel());
         uiLanguageEditor.setLabel(constants.uiLanguageLabel());
         sysprepScriptEditor.setTitle(constants.sysprepLabel());
+        activeDirectoryOUEditor.setLabel(constants.activeDirectoryOU());
         systemLocaleEditor.setLabel(constants.systemLocaleLabel());
         userLocaleEditor.setLabel(constants.userLocaleLabel());
         userNameEditor.setLabel(constants.cloudInitUserNameLabel());
@@ -447,6 +453,7 @@
         inputLocaleEditor.addStyleName(customizableStyle.primaryOption());
         uiLanguageEditor.addStyleName(customizableStyle.primaryOption());
         
sysprepScriptEditor.setContentWidgetStyleName(customizableStyle.customScript());
+        
activeDirectoryOUEditor.addStyleName(customizableStyle.primaryOption());
         systemLocaleEditor.addStyleName(customizableStyle.primaryOption());
         userLocaleEditor.addStyleName(customizableStyle.primaryOption());
         userNameEditor.addStyleName(customizableStyle.primaryOption());
diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml
index 95716e0..db4dad4 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml
@@ -64,6 +64,7 @@
             <e:EntityModelTextBoxEditor ui:field="uiLanguageEditor" />
             <e:EntityModelTextBoxEditor ui:field="systemLocaleEditor" />
             <e:EntityModelTextBoxEditor ui:field="userLocaleEditor" />
+            <e:EntityModelTextBoxEditor ui:field="activeDirectoryOUEditor" />
             <d:AdvancedParametersExpander ui:field="sysprepScriptExpander" 
addStyleNames="{style.verticalPanel}"/>
             <g:FlowPanel ui:field="sysprepScriptExpanderContent" >
                 <e:EntityModelTextAreaEditor ui:field="sysprepScriptEditor" 
labelStyleName="{style.displayNone}" />
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java
index 85752f2..7ed8e28 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java
@@ -107,8 +107,18 @@
     public EntityModel getUserName() {
         return privateUserName;
     }
+
     private void setUserName(EntityModel value) {
         privateUserName = value;
+    }
+
+    private EntityModel privateActiveDirectoryOU;
+    public EntityModel getActiveDirectoryOU() {
+        return privateActiveDirectoryOU;
+    }
+
+    private void setActiveDirectoryOU(EntityModel value) {
+        privateActiveDirectoryOU = value;
     }
 
     private EntityModel privateHostname;
@@ -396,6 +406,7 @@
         setSystemLocale(new EntityModel());
         setUserLocale(new EntityModel());
         setSysprepScript(new EntityModel());
+        setActiveDirectoryOU(new EntityModel());
 
         setHostname(new EntityModel());
         setDomain(new EntityModel());
@@ -471,6 +482,7 @@
         getAuthorizedKeys().setEntity("");
         getRegenerateKeysEnabled().setEntity(false);
         getCustomScript().setEntity("");
+        getActiveDirectoryOU().setEntity("");
 
         Map<String, String> timezones = 
TimeZoneType.GENERAL_TIMEZONE.getTimeZoneList();
         getTimeZoneList().setItems(timezones.entrySet());
@@ -548,6 +560,10 @@
                 } else {
                     getCustomScript().setEntity(vmInit.getCustomScript());
                 }
+            }
+
+            if (!StringHelper.isNullOrEmpty(vmInit.getActiveDirectoryOU())) {
+                
getActiveDirectoryOU().setEntity(vmInit.getActiveDirectoryOU());
             }
 
             initNetworks(vmInit);
@@ -784,6 +800,7 @@
             vmInit.setSystemLocale((String)getSystemLocale().getEntity());
             vmInit.setUserLocale((String)getUserLocale().getEntity());
             vmInit.setCustomScript((String) getSysprepScript().getEntity());
+            vmInit.setActiveDirectoryOU((String) 
getActiveDirectoryOU().getEntity());
         } else {
             vmInit.setCustomScript((String) getCustomScript().getEntity());
         }
diff --git a/packaging/conf/sysprep/sysprep.2k12x64 
b/packaging/conf/sysprep/sysprep.2k12x64
index 6f82c1e..9137987 100644
--- a/packaging/conf/sysprep/sysprep.2k12x64
+++ b/packaging/conf/sysprep/sysprep.2k12x64
@@ -15,6 +15,7 @@
                 </Credentials>
                 <DebugJoin>true</DebugJoin>
                 <JoinDomain>$JoinDomain$</JoinDomain>
+                <MachineObjectOU>$MachineObjectOU$<MachineObjectOU>
             </Identification>
         </component>
     </settings>
diff --git a/packaging/conf/sysprep/sysprep.2k3 
b/packaging/conf/sysprep/sysprep.2k3
index 380b87c..b8696af 100644
--- a/packaging/conf/sysprep/sysprep.2k3
+++ b/packaging/conf/sysprep/sysprep.2k3
@@ -35,6 +35,7 @@
     JoinDomain=$JoinDomain$
     DomainAdmin=$DomainAdmin$
     DomainAdminPassword=$DomainAdminPassword$
+    MachineObjectOU=$MachineObjectOU$
 
 [Networking]
     InstallDefaultComponents=Yes
diff --git a/packaging/conf/sysprep/sysprep.2k8 
b/packaging/conf/sysprep/sysprep.2k8
index 12ff6c0..e6a4cbb 100644
--- a/packaging/conf/sysprep/sysprep.2k8
+++ b/packaging/conf/sysprep/sysprep.2k8
@@ -13,6 +13,7 @@
                 </Credentials>
                 <JoinDomain>$JoinDomain$</JoinDomain>
                 <DebugJoin>true</DebugJoin>
+                <MachineObjectOU>$MachineObjectOU$<MachineObjectOU>
             </Identification>
         </component>
         <component name="Microsoft-Windows-Shell-Setup" 
processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" 
language="neutral" versionScope="nonSxS" 
xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
diff --git a/packaging/conf/sysprep/sysprep.2k8x64 
b/packaging/conf/sysprep/sysprep.2k8x64
index 5a93807..a53371e 100644
--- a/packaging/conf/sysprep/sysprep.2k8x64
+++ b/packaging/conf/sysprep/sysprep.2k8x64
@@ -15,6 +15,7 @@
                 </Credentials>
                 <DebugJoin>true</DebugJoin>
                 <JoinDomain>$JoinDomain$</JoinDomain>
+                <MachineObjectOU>$MachineObjectOU$<MachineObjectOU>
             </Identification>
         </component>
     </settings>
diff --git a/packaging/conf/sysprep/sysprep.w7 
b/packaging/conf/sysprep/sysprep.w7
index a60e412..5243f5c 100644
--- a/packaging/conf/sysprep/sysprep.w7
+++ b/packaging/conf/sysprep/sysprep.w7
@@ -35,6 +35,7 @@
                     <Username>$DomainAdmin$</Username>
                 </Credentials>
                 <JoinDomain>$JoinDomain$</JoinDomain>
+                <MachineObjectOU>$MachineObjectOU$<MachineObjectOU>
             </Identification>
         </component>
         <component name="Microsoft-Windows-Shell-Setup" 
processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" 
language="neutral" versionScope="nonSxS" 
xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
diff --git a/packaging/conf/sysprep/sysprep.w7x64 
b/packaging/conf/sysprep/sysprep.w7x64
index 864876f..3b7b37c 100644
--- a/packaging/conf/sysprep/sysprep.w7x64
+++ b/packaging/conf/sysprep/sysprep.w7x64
@@ -52,6 +52,7 @@
                     <Username>$DomainAdmin$</Username>
                 </Credentials>
                 <JoinDomain>$JoinDomain$</JoinDomain>
+                <MachineObjectOU>$MachineObjectOU$<MachineObjectOU>
             </Identification>
         </component>
     </settings>
diff --git a/packaging/conf/sysprep/sysprep.w8 
b/packaging/conf/sysprep/sysprep.w8
index 36b365e..ed0f765 100644
--- a/packaging/conf/sysprep/sysprep.w8
+++ b/packaging/conf/sysprep/sysprep.w8
@@ -35,6 +35,7 @@
                     <Username>$DomainAdmin$</Username>
                 </Credentials>
                 <JoinDomain>$JoinDomain$</JoinDomain>
+                <MachineObjectOU>$MachineObjectOU$<MachineObjectOU>
             </Identification>
         </component>
         <component name="Microsoft-Windows-Shell-Setup" 
processorArchitecture="x86" publicKeyToken="31bf3856ad364e35" 
language="neutral" versionScope="nonSxS" 
xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
diff --git a/packaging/conf/sysprep/sysprep.w8x64 
b/packaging/conf/sysprep/sysprep.w8x64
index c8d2dbf..ef2684f 100644
--- a/packaging/conf/sysprep/sysprep.w8x64
+++ b/packaging/conf/sysprep/sysprep.w8x64
@@ -52,6 +52,7 @@
                     <Username>$DomainAdmin$</Username>
                 </Credentials>
                 <JoinDomain>$JoinDomain$</JoinDomain>
+                <MachineObjectOU>$MachineObjectOU$<MachineObjectOU>
             </Identification>
         </component>
     </settings>
diff --git a/packaging/conf/sysprep/sysprep.xp 
b/packaging/conf/sysprep/sysprep.xp
index 5cda4a1..7d678e2 100644
--- a/packaging/conf/sysprep/sysprep.xp
+++ b/packaging/conf/sysprep/sysprep.xp
@@ -31,6 +31,7 @@
     JoinDomain=$JoinDomain$
     DomainAdmin=$DomainAdmin$
     DomainAdminPassword=$DomainAdminPassword$
+    MachineObjectOU=$MachineObjectOU$
 
 [Networking]
     InstallDefaultComponents=Yes
diff --git 
a/packaging/dbscripts/upgrade/03_05_0180_vm_init_add_active_directory_ou.sql 
b/packaging/dbscripts/upgrade/03_05_0180_vm_init_add_active_directory_ou.sql
new file mode 100644
index 0000000..7e6531e
--- /dev/null
+++ b/packaging/dbscripts/upgrade/03_05_0180_vm_init_add_active_directory_ou.sql
@@ -0,0 +1,5 @@
+-- ----------------------------------------------------------------------
+-- Adding user name for vm_init table (cloud-init usage)
+-- ----------------------------------------------------------------------
+alter table vm_init
+add column active_directory_ou VARCHAR(256) DEFAULT NULL;
diff --git a/packaging/dbscripts/vms_sp.sql b/packaging/dbscripts/vms_sp.sql
index f82e3f6..fac0661 100644
--- a/packaging/dbscripts/vms_sp.sql
+++ b/packaging/dbscripts/vms_sp.sql
@@ -1221,7 +1221,8 @@
     v_ui_language VARCHAR(256),
     v_system_locale VARCHAR(256),
     v_user_locale VARCHAR(256),
-    v_user_name VARCHAR(256))
+    v_user_name VARCHAR(256),
+    v_active_directory_ou VARCHAR(256))
 
 RETURNS VOID
 
@@ -1232,7 +1233,7 @@
           time_zone=v_time_zone, dns_servers=v_dns_servers, 
dns_search_domains=v_dns_search_domains,
           networks=v_networks, password=v_password, winkey=v_winkey, 
custom_script=v_custom_script,
           input_locale=v_input_locale, ui_language=v_ui_language, 
system_locale=v_system_locale,
-          user_locale=v_user_locale, user_name=v_user_name
+          user_locale=v_user_locale, user_name=v_user_name, 
active_directory_ou=v_active_directory_ou
       WHERE vm_id = v_vm_id;
 END; $procedure$
 LANGUAGE plpgsql;
@@ -1266,16 +1267,17 @@
     v_ui_language VARCHAR(256),
     v_system_locale VARCHAR(256),
     v_user_locale VARCHAR(256),
-    v_user_name VARCHAR(256))
+    v_user_name VARCHAR(256),
+    v_active_directory_ou VARCHAR(256))
 RETURNS VOID
    AS $procedure$
 BEGIN
 INSERT INTO vm_init(vm_id, host_name, domain, authorized_keys, 
regenerate_keys, time_zone, dns_servers, dns_search_domains,
                     networks, password, winkey, custom_script, input_locale, 
ui_language,
-                    system_locale, user_locale, user_name)
+                    system_locale, user_locale, user_name, active_directory_ou)
        VALUES(v_vm_id, v_host_name, v_domain, v_authorized_keys, 
v_regenerate_keys, v_time_zone, v_dns_servers, v_dns_search_domains,
                     v_networks, v_password, v_winkey, v_custom_script, 
v_input_locale, v_ui_language,
-                    v_system_locale, v_user_locale, v_user_name);
+                    v_system_locale, v_user_locale, v_user_name, 
v_active_directory_ou);
 
 END; $procedure$
 LANGUAGE plpgsql;


-- 
To view, visit http://gerrit.ovirt.org/26086
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb63316e8505affd5d78edd90881b2c7cd83e05f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shahar Havivi <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to