Delete Agent's Windows service creation

This commit deletes vRouter agent's service creation
from MSI. Right now, we stick to NSSM for Windows service creation
of Contrail components, so MSI creates a "dead" service.

Change-Id: I6309dac661c4f9efb6f8b64d6353664e43ea420b
Partial-Bug: #1737177

lib/SConscript

@@ -21,7 +21,6 @@ if platform.system() == 'Windows':
         'SimpleAmqpClient',
         'gunit',
         'http_parser',
-        'winsw',
         'cmocka',
     ]
 else:

src/vnsw/agent/contrail/SConscript

@@ -129,7 +129,7 @@ if platform.system() == 'Windows':
 
     env.Append(WIXCANDLEFLAGS = ['-ext', 'WixUtilExtension.dll'])
     env.Append(WIXLIGHTFLAGS = ['-ext', 'WixUtilExtension.dll'])
-    env.Depends(agent_msi, [contrail_vrouter_agent, 'winsw'])
+    env.Depends(agent_msi, [contrail_vrouter_agent])
 
     env.Alias('contrail-vrouter-agent.msi', agent_msi)
     env.Default(agent_msi)
@@ -155,7 +155,7 @@ for utils in utils_scripts:
 env.Alias('install', env.Install(env['INSTALL_CONF'],
           '../contrail-vrouter-agent.conf'))
 env.Alias('install',
-        env.InstallAs(env['INSTALL_CONF'] + 
+        env.InstallAs(env['INSTALL_CONF'] +
         '/supervisord_vrouter_files/' + 'contrail-vrouter-agent.ini',
         '../contrail-vrouter-agent.ini'))
 env.Alias('install',
@@ -164,7 +164,7 @@ env.Alias('install',
 env.Alias('install',
         env.InstallAs(env['INSTALL_SYSTEMD'] + '/contrail-vrouter-agent.service',
         '../systemd/contrail-vrouter-agent.service'))
-env.Alias('install', env.Install(env['INSTALL_CONF'], 
+env.Alias('install', env.Install(env['INSTALL_CONF'],
     '../supervisord_vrouter.conf'))
 env.Alias('install', env.Install(
     env['INSTALL_MESSAGE_DOC'] + '/contrail-vrouter-agent/',

src/vnsw/agent/contrail/windows/msi/agent_msi.wxs

@@ -7,35 +7,12 @@
         <Media Id="1" Cabinet="product.cab" EmbedCab="yes"/>
 
         <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="CommonAppDataFolder">
-                <Directory Id="ROOTDIR" Name="Contrail">
-                    <Directory Id="ETCDIR" Name="etc">
-                        <Directory Id="CONFIGDIR" Name="contrail">
-                            <Component Id="ContrailVrouterAgentConfig" Guid="3386587D-A358-4193-90E7-AD2F659113E5" Win64="yes">
-                                <File Id="ContrailVrouterAgentConfig" Name="contrail-vrouter-agent.conf.sample" Source="controller/src/vnsw/agent/contrail-vrouter-agent.conf"/>
-                            </Component>
-                        </Directory>
-                    </Directory>
-                </Directory>
-            </Directory>
             <Directory Id="ProgramFiles64Folder">
                 <Directory Id="ManufacturerFolder" Name="Juniper Networks">
                     <Directory Id="INSTALLDIR" Name="Agent">
                         <Component Id="AgentMainExe" Guid="0AA4E35B-89F0-4E60-8D1C-F79BFBE49F78" Win64="yes">
                             <File Id="AgentMainExe" Source="build/$(var.optimization)/vnsw/agent/contrail/contrail-vrouter-agent.exe"/>
                         </Component>
-                        <Component Id="AgentServiceWrapperExe" Guid="8A6640CF-5EA0-4F16-A006-0991147E0D9E" Win64="yes">
-                            <File Id="AgentServiceWrapperExe" Name="contrail-vrouter-agent-sw.exe" Source="build/bin/winsw.exe"/>
-                            <ServiceInstall Id="CreateService" Name="ContrailAgent" DisplayName="ContrailAgent" Type="ownProcess" Start="demand" ErrorControl="normal">
-                                <util:ServiceConfig
-                                    FirstFailureActionType="restart"
-                                    SecondFailureActionType="restart"
-                                    ThirdFailureActionType="restart"
-                                    ResetPeriodInDays="1"
-                                    RestartServiceDelayInSeconds="0"/>
-                            </ServiceInstall>
-                            <ServiceControl Id="DeleteService" Name="ContrailAgent" Remove="both" Stop="both" Wait="yes"/>
-                        </Component>
                         <Component Id="VRouterHypervScript" Guid="2E5ED884-4461-4852-B841-CF6FE4E1E6B7" Win64="yes">
                             <File Id="VRouterHypervScript" Source="controller/src/vnsw/opencontrail-vrouter-netns/opencontrail_vrouter_netns/vrouter_hyperv.py" />
                         </Component>
@@ -54,29 +31,19 @@
                         <Component Id="CurlDll" Guid="BE814CFF-7812-4D99-8E69-94A19185563F" Win64="yes">
                             <File Id="CurlDll" Source="build/bin/libcurl.dll"/>
                         </Component>
-                        <Component Id="SampleConfig" Guid="5E840E9E-96D6-41F4-A384-1500A089CAEB" Win64="yes">
-                            <File Id="SampleConfig" Name="contrail-vrouter-agent.conf.sample" Source="controller/src/vnsw/agent/contrail-vrouter-agent.conf"/>
-                        </Component>
-                        <Component Id="AgentServiceWrapperConfig" Guid="3DE6D859-E950-40EE-9A36-0A894AFF1FCD" Win64="yes">
-                            <File Id="AgentServiceWrapperConfig" Name="contrail-vrouter-agent-sw.xml" Source="controller/src/vnsw/agent/contrail/windows/service_config/service-wrapper.xml"/>
-                        </Component>
                     </Directory>
                 </Directory>
             </Directory>
         </Directory>
 
         <Feature Id="DefaultFeature" Level="1">
             <ComponentRef Id="AgentMainExe"/>
-            <ComponentRef Id="AgentServiceWrapperExe"/>
-            <ComponentRef Id="AgentServiceWrapperConfig"/>
             <ComponentRef Id="VRouterHypervScript"/>
             <ComponentRef Id="VRouterCommonScript"/>
             <ComponentRef Id="VRouterHypervInjectIPScript"/>
             <ComponentRef Id="TbbDll"/>
             <ComponentRef Id="Log4CPlusDll"/>
             <ComponentRef Id="CurlDll"/>
-            <ComponentRef Id="SampleConfig"/>
-            <ComponentRef Id="ContrailVrouterAgentConfig"/>
         </Feature>
     </Product>
 </Wix>