Bug 1441 - Restructurization of silecsdeploy - fixed xsd

silecs-codegen/src/xml/xmltemplate.py

@@ -47,7 +47,7 @@ silecsHeader = """<?xml version="1.0" encoding="UTF-8"?>
 def getSilecsHeader(silecsVersion):
 	date = time.strftime("%x")
 	owner = getpass.getuser()
-	return silecsHeader%(silecsVersion,date,date,owner,owner)
+	return silecsHeader % (silecsVersion, date, date, owner, owner)
 
 #=========================================================
 # DESIGN TEMPLATE
@@ -69,10 +69,10 @@ designTemplate = """<?xml version="1.0" encoding="UTF-8"?>
     </SILECS-Class>
 </SILECS-Design>
 """
-def getDesignTemplate(designName,schemaPath,silecsVersion):
+def getDesignTemplate(designName, schemaPath, silecsVersion):
 	date = time.strftime("%x")
 	owner = getpass.getuser()
-	return designTemplate%(silecsVersion,date,date,schemaPath,owner,owner,designName)
+	return designTemplate % (silecsVersion, date, date, schemaPath, owner, owner, designName)
 
 
 #=========================================================
@@ -87,11 +87,12 @@ deployTemplate = """<?xml version="1.0" encoding="UTF-8"?>
         <Editor user-login="%s"/>
     </Information>
     <Deploy-Unit name="%s" version="0.1.0"/>
+    <SilecsDesign silecs-design-name="" silecs-design-version=""/>
+        
 	<Controller host-name="">
-	    <Siemens-PLC system="TIA-PORTAL" model="SIMATIC_S7-300" protocol="DEVICE_MODE" base-DB-number="1"/>
-		<SilecsDesign silecs-design-version="" silecs-design-name="">
-			<Device device-name="" />
-		</SilecsDesign>
+	    <Siemens-PLC system="TIA-PORTAL" model="SIMATIC_S7-300" protocol="DEVICE_MODE" base-DB-number="1">
+	        <Device silecs-device-label="dev0" silecs-design-ref="" fesa-device-name="" fesa-fec-name=""/>
+	    </Siemens-PLC>
 	</Controller>
 </SILECS-Deploy>
 """
@@ -99,4 +100,4 @@ deployTemplate = """<?xml version="1.0" encoding="UTF-8"?>
 def getDeployTemplate(deployName, schemaPath, silecsVersion):
 	date = time.strftime("%x")
 	owner = getpass.getuser()
-	return deployTemplate%(silecsVersion,date,date,schemaPath,owner,owner,deployName)
+	return deployTemplate % (silecsVersion, date, date, schemaPath, owner, owner, deployName)