Update diagramme UML pour NEW ARCHI DeviceController

Etienne Pallier
1 parent 57621753
Showing 3 changed files with 221 additions and 54 deletions Show diff stats
src/core/pyros_django/majordome/doc/AgentMajordome_object_diag.pu
src/device_controller/concrete_component/gemini/proof_of_concept_for_Protocol.py
src/device_controller/concrete_component/gemini/proof_of_concept_for_multi_inherit.py
@@ -65,20 +65,34 @@ AgentMajordome -d-&gt; AD_Sensor1 : sends cmd to
 AgentMajordome -d-> AD_Shutter2 : sends cmd to
  
  
-/' 
-======= Abstract Device Controllers =======
-class DeviceControllerAbstract
-class DC_FilterSelector
-class DC_DetectorShutter
-class DC_DetectorSensor
-'/
+class DeviceController {
+	ip, port
+	channel: ClientChannel
+	protocol: Protocol
+	gen2nat_cmds # abstract
+}
+
+class DC_Mount {
+	gen2nat_cmds # abstract
+}
+class DC_DetectorShutter {
+	gen2nat_cmds # abstract
+}
+class DC_DetectorSensor {
+	gen2nat_cmds # abstract
+}
+class DC_FilterSelector {
+	gen2nat_cmds # abstract
+}
+
+
  
  
 /' ======= CHANNELS ======= '/
  
-DeviceControllerAbstract o-l- DeviceSimulator
+DeviceController "1" o-r- "0..1" DeviceSimulator
  
-DeviceControllerAbstract o-d- ClientChannel
+DeviceController o-d- ClientChannel
 class ClientChannelSerial #lightred
 class ClientChannelSocket #lightred
 class ClientChannelUSB #lightred
@@ -89,33 +103,36 @@ ClientChannel &lt;|-- ClientChannelUSB
  
 /' ======= GEMINI controllers (& sim) ======= '/
  
-class AgentDeviceTelescopeGemini #lightblue
-AgentDeviceTelescopeGemini -u--|> AgentDevice
+class AgentDeviceGemini #lightblue
+AgentDeviceGemini -u--|> AgentDevice
  
 /' Components (only 1) '/
-AD_Telescope1 -d-> AgentDeviceTelescopeGemini :alias of
+AD_Telescope1 -d-> AgentDeviceGemini :alias of
  
 /'DC_Mount o-left- DS_Mount'/
  
-AgentDeviceTelescopeGemini --> DC_Gemini :use
-/'DC_Gemini o-left- DS_Gemini'/
+/'AgentDeviceGemini ---> DC_Gemini :use'/
+AgentDeviceGemini "1" o--- "1" DC_Gemini :use
  
 /' Controllers '/
+class DC_Gemini {
+	(client)
+	protocol: Protocol
+	gen2nat_cmds # gemini
+}
 class DC_Gemini <<Singleton>> #lightblue
-class DC_MountGemini #lightblue
 DC_Gemini <.l> gemini_device : channel/\nsocket
-DC_Gemini ---|> DeviceControllerAbstract
-DC_Gemini o-- DC_MountGemini
-DC_MountGemini --d|> DC_Mount
-DC_Mount --|> DeviceControllerAbstract
+DC_Gemini ---|> DeviceController
+DC_Gemini "*" o-- "1" DC_Mount
+DC_Mount --|> DeviceController
  
 /' Simulators '/
+class DS_Gemini {
+	(server)
+}
 class DS_Gemini #lightblue
-class DS_MountGemini #lightblue
 DS_Gemini ---|> DeviceSimulator
-DS_Gemini o-down-> DS_MountGemini
-DS_MountGemini -d-|> DS_Mount
-DS_Mount --|> DeviceSimulator
+DC_Gemini "1" o- "1" DS_Gemini
  
  
  
@@ -129,45 +146,34 @@ AD_FilterSelector1 --&gt; AgentDeviceSBIG :alias of
 AD_Shutter1 --> AgentDeviceSBIG :alias of
 AD_Sensor1 --> AgentDeviceSBIG :alias of
  
-AgentDeviceSBIG -d-> DC_SBIG :use
-/'DC_SBIG o- DS_SBIG'/
+AgentDeviceSBIG "1" o-d-> "1" DC_SBIG :use
+DC_SBIG "1" o- "1" DS_SBIG
  
 /' Controllers '/
  
+class DC_SBIG {
+	(client)
+	protocol: Protocol
+	gen2nat_cmds # sbig
+}
 class DC_SBIG <<Singleton>> #lightgreen
-class DC_DetectorSensorSBIG #lightgreen
-class DC_DetectorShutterSBIG #lightgreen
-class DC_FilterSelectorSBIG #lightgreen
  
 DC_SBIG <.r> sbig_device : channel/\nsocket
-DC_SBIG ---|> DeviceControllerAbstract
-DC_SBIG "0..1" o-down- DC_DetectorSensorSBIG
-DC_SBIG "0..1" o-down- DC_DetectorShutterSBIG
-DC_SBIG "0..1" o-down- DC_FilterSelectorSBIG
-
-DC_DetectorSensorSBIG --d|> DC_DetectorSensor
-DC_DetectorShutterSBIG --d|> DC_DetectorShutter
-DC_FilterSelectorSBIG --d|> DC_FilterSelector
+DC_SBIG ---|> DeviceController
+DC_SBIG "*" o-down- "0..1" DC_DetectorSensor
+DC_SBIG "*" o-down- "0..1" DC_DetectorShutter
+DC_SBIG "*" o-down- "0..1" DC_FilterSelector
  
-DC_DetectorSensor --|> DeviceControllerAbstract
-DC_DetectorShutter --|> DeviceControllerAbstract
-DC_FilterSelector --|> DeviceControllerAbstract
+DC_DetectorSensor --|> DeviceController
+DC_DetectorShutter --|> DeviceController
+DC_FilterSelector --|> DeviceController
  
 /' Simulators '/
+class DS_SBIG {
+	(server)
+}
 class DS_SBIG #lightgreen
-class DS_DetectorSensorSBIG #lightgreen
-class DS_DetectorShutterSBIG #lightgreen
-class DS_FilterSelectorSBIG #lightgreen
 DS_SBIG ---|> DeviceSimulator
-DS_SBIG o-down- DS_DetectorShutterSBIG
-DS_SBIG o-down- DS_DetectorSensorSBIG
-DS_SBIG o-down- DS_FilterSelectorSBIG
-DS_DetectorShutterSBIG -d-|> DS_DetectorShutter
-DS_DetectorSensorSBIG -d-|> DS_DetectorSensor
-DS_FilterSelectorSBIG -d-|> DS_FilterSelector
-DS_DetectorShutter --|> DeviceSimulator
-DS_DetectorSensor --|> DeviceSimulator
-DS_FilterSelector --|> DeviceSimulator
  
  
 /' ======= LEGEND ======= '/
@@ -175,7 +181,7 @@ DS_FilterSelector --|&gt; DeviceSimulator
 skinparam legendFontSize 11
  
 legend left
-<i>Version 22-10-2019 (E. Pallier)</i>
+<i>Version 04-11-2019 (E. Pallier)</i>
  
 Colors: <b>yellow</b> : abstract classes ; <b>red</b> : real devices ; <b>blue</b> : Gemini concrete classes ; <b>green</b> : SBIG concrete classes
  
@@ -184,12 +190,12 @@ AD = &lt;b&gt;Agent Device&lt;/b&gt;
 DC = <b>Device Controller</b> (Device <b>client</b>, pyros <b>generic commands only</b>):
 - translates an agent <b>generic</b> command to a native command, and sends it to device
 - receives device's native answer, translates it to <b>generic</b> and returns it back to agent
-(<i>every DC is composed of a <b>DS of the same name</b></i>) 
+(<i>every DC can be composed of a <b>DS of the same name</b></i>) 
+(<i>every DC contains a 'generic to native' commands dictionary named "gen2nat_cmds")</i> 
  
 DS = <b>Device Simulator</b> (Device placeholder <b>server</b>, <b>native commands only</b>):
 - receives <b>native</b> commands from client
 - returns (simulated) <b>native</b> answer to client
-(<i>every DS contains a 'generic to native' dictionary named "gen2nat_qa")</i> 
 (<i>abstract DS receive only generic commands and return generic answers</i>)
 endlegend
  
@@ -0,0 +1,72 @@
+
+class DC:
+
+    class Protoc:
+        def encap(self):
+            print("DC encap")
+        def uncap(self): 
+            pass
+
+    def encap(self):
+        ##self.Protoc.encap(self)
+        self._protoc.encap(self)
+
+    def __init__(self, name, toto="dc toto", protoc=None):
+        self.toto = toto
+        self._protoc = protoc if protoc else self.Protoc
+        print("in DC")
+
+
+class DC1(DC):
+    def __init__(self, name, protoc=None):
+        print("in DC1")
+        # @override
+        ##self._protoc = protoc
+        ##DC.__init__(self, name, protoc)
+        super().__init__(name, protoc=protoc)
+        #super().__init__(name, protoc)
+
+
+class DC2(DC):
+    def __init__(self, name):
+        print("in DC2")
+        self.b = 'tata'
+        #super().__init__(name)
+        DC.__init__(self, name)
+
+
+class DC3(DC):
+    def __init__(self, name):
+        print("in DC3")
+        #super().__init__(name)
+        DC.__init__(self, name)
+
+
+class DCGem(DC):
+    # @override
+    class Protoc:
+        def encap(self):
+            DC.Protoc.encap(self)
+            #super().Protoc.encap(self)
+            # this is equivalent to
+            #super(DCGem,self).Protoc.encap(self)
+            print("DCGem encap")
+        def uncap(self): 
+            pass
+
+    def __init__(self):
+        super().__init__("nom_dcgem", "gem toto")
+        # same as :
+        #super().__init__("nom_dcgem", self.Protoc)
+        print("_protoc is:", self._protoc)
+        self.dc1 = DC1("nom_dc1", self.Protoc)
+        self.dc1.encap()
+
+
+dcg = DCGem()
+print ("gem toto is", dcg.toto)
+print ("dc1 toto is", dcg.dc1.toto)
+#dcg.Protoc.encap(dcg)
+##dcg.encap()
+
+
@@ -0,0 +1,89 @@
+
+class DC:
+    def __init__(self, name):
+        print("in DC")
+        self.name = name
+
+    def print_name(self): print(self.name)
+
+    def toto(self):
+        print("\nI am", self)
+        print("DC toto")
+
+
+
+class DCGeneral(DC):
+    def __init__(self, name):
+        print("in DC1")
+        self.a = 'toto'
+        super().__init__(name)
+        #DC.__init__(self, name)
+
+class DC1(DC):
+    def __init__(self, name):
+        print("in DC1")
+        self.a = 'toto'
+        super().__init__(name)
+        #DC.__init__(self, name)
+    def goto(self):
+        print("DC1 goto")
+
+
+class DC2(DC):
+    def __init__(self, name):
+        print("in DC2")
+        self.b = 'tata'
+        super().__init__(name)
+        #DC.__init__(self, name)
+    def goto(self):
+        print("DC2 goto")
+
+
+class DC3(DC):
+    def __init__(self, name):
+        print("in DC3")
+        super().__init__(name)
+        #DC.__init__(self, name)
+
+class DCSBIG(DCGeneral, DC1,DC2,DC3):
+    def __init__(self):
+        # DC general
+        super().__init__("DC_general")
+        # DC components
+        DC1.__init__(self, "DC1")
+        DC2.__init__(self, "DC2")
+        DC3.__init__(self, "DC3")
+        self.name = "gem"
+
+    def printall(self):
+        # by default, DC1 goto
+        self.goto()
+        # DC2 goto
+        DC2.goto(self)
+        # by default, DCSBIG toto
+        self.toto()
+        # DC toto AND NOT DCSBIG's, problem for the protocol !!!!!!!!!!!!!!!!
+        DC1.toto(self)
+        DC2.toto(self)
+
+        # force to DCSBIG toto !!!
+        DC1.toto = self.toto
+        DC1.toto()
+
+    def toto(self):
+        print("DCSBIG toto")
+
+
+print(DCSBIG.mro())
+#dc1 = DC1('toto')
+#dc1.print_name()
+#print(DCGem.__mro__)
+dcs = DCSBIG()
+dcs.print_name()
+print(dcs.a)
+print(dcs.b)
+dcs.printall()
+
+# DC1 goto
+#dcs.goto()
+