Merge branch 'luciano' of bitbucket.org:ikflowdat/ftth

Conflicts:
	app/config/url_webservice.yml.dist
	composer.lock

Dockerfile

@@ -0,0 +1,42 @@
+FROM debian:8
+EXPOSE 8000
+
+#RUN echo "Acquire::http::Proxy \"http://172.17.0.5:3142\";" | tee /etc/apt/apt.conf.d/00aptproxy
+
+RUN apt-get update 
+RUN apt-get install -yq git wget vim tmux php5-cli php5-mysql php5-curl
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '669656bab3166a7aff8a7506b8cb2d1c292f042046c5a994c43155c0be6190fa0355160742ab2e1c88d40d5be660b410') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php --install-dir=/usr/local/bin --filename=composer
+RUN php -r "unlink('composer-setup.php');"
+
+ADD . /opt/ftth
+
+RUN mkdir ~/.ssh
+RUN ssh-keyscan -H bitbucket.org >> ~/.ssh/known_hosts
+RUN ssh-keyscan -H -p 222 200.50.168.30 >> ~/.ssh/known_hosts
+
+WORKDIR /opt/ftth
+
+RUN chmod 0600 keys/*
+
+RUN rm -rf /opt/ftth/vendor/*
+RUN rm -f app/config/parameters.yml
+RUN rm -f app/config/url_webservice.yml
+RUN rm -f app/config/hwioauthbundle/parameters.yml
+
+RUN cp app/config/parameters.yml.docker app/config/parameters.yml
+RUN cp app/config/url_webservice.yml.docker app/config/url_webservice.yml
+RUN cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml
+
+RUN rm -rf /opt/ftth/app/config/parameters.yml /opt/ftth/app/config/url_webservice.yml
+
+CMD eval $(ssh-agent) ; ssh-add keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction ;\
+	rm var/cache/* -rf ;\
+ 	cp app/config/parameters.yml.docker app/config/parameters.yml ;\
+ 	cp app/config/url_webservice.yml.docker app/config/url_webservice.yml ;\
+ 	cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml ;\
+        composer dump-autoload ;\
+        composer run-script symfony-scripts ;\
+ 	cat app/config/hwioauthbundle/parameters.yml ; bin/console server:run 0.0.0.0

app/config/hwioauthbundle/parameters.yml.docker

@@ -0,0 +1,6 @@
+parameters:
+    client_id: %env(OAUTH_CLIENT_ID)%
+    client_secret: %env(OAUTH_CLIENT_SECRET)%
+    access_token_url:    "http://%env(HOST_BASE)%/oauth/v2/token"
+    authorization_url:   "http://%env(HOST_BASE)%/oauth/v2/auth"
+    infos_url:           "http://%env(HOST_BASE)%/api/user/me"

app/config/parameters.yml.docker

@@ -0,0 +1,31 @@
+# This file is a "template" of what your parameters.yml file should look like
+# Set parameters here that may be different on each deployment target of the app, e.g. development, staging, production.
+# http://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
+parameters:
+    database_driver:   pdo_mysql
+    database_host:     mysql
+    database_port:     ~
+    database_name:     fd3_ftth
+    database_user:     root
+    database_password: 235r2342gtfsw
+    # You should uncomment this if you want use pdo_sqlite
+    # database_path: "%kernel.root_dir%/data.db3"
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+    jms_serializer.camel_case_naming_strategy.class: JMS\Serializer\Naming\IdenticalPropertyNamingStrategy
+
+    # Url para logout en repositorio base
+    url_logout: 'http://%env(HOST_BASE)%/logout'
+
+    # amqp queue config
+    rabbit_mq.host:     'amqp'
+    rabbit_mq.port:     5672
+    rabbit_mq.user:     'guest'
+    rabbit_mq.password: 'guest'
+    rabbit_mq.vhost:    '/'

app/config/url_webservice.yml.dist

@@ -1,8 +1,7 @@
 parameters:
-    client: 'http://127.0.0.1/base/api/clients.json'
-    url_base: 'http://200.50.168.111/base/app_dev.php' # url app Base
+    # Url base create client
+    remote_client_create_url: '%url_base%/admin/client/client/create'
+    url_base: 'http://200.50.168.111/base/app_dev.php/' # url app Base
+    client: '%url_base%api/clients.json'
     sidebar_menu: # urls para el sidebar menu 
         Base: '%url_base%'
-    
-    # Url base create client
-    remote_client_create_url: '%url_base%/admin/client/client/create'

app/config/url_webservice.yml.docker

@@ -0,0 +1,6 @@
+parameters:
+    url_base: 'http://%env(HOST_BASE)%'
+    client: '%url_base%/api/clients.json'
+    remote_client_create_url: '%url_base%/admin/client/client/create'
+    sidebar_menu:
+      Base: '%url_base%/'

src/FTTHBundle/Admin/OLTAdmin.php

@@ -17,15 +17,11 @@ class OLTAdmin extends BaseAdmin
     {
         $datagridMapper
             ->add('name')
-            ->add('mark')
+            ->add('model')
             ->add('ip')
             ->add('snmpCommunity')
             ->add('sshUser')
             ->add('sshPass')
-            ->add('firmware')
-            ->add('libraryVersion')
-            ->add('executeSnmp')
-            ->add('model')
         ;
     }
 
@@ -36,14 +32,11 @@ class OLTAdmin extends BaseAdmin
     {
         $listMapper
             ->add('name')
-            ->add('mark')
+            ->add('model')
             ->add('ip')
             ->add('snmpCommunity')
             ->add('sshUser')
             ->add('sshPass')
-            ->add('executeSnmp')
-            ->add('model')
-            ->add('workflow')
             ->add('currentState','string', array('template' => 'WorkflowBundle:Workflow:base_list_field_current_state.html.twig'))
             ->add('_action', null, array(
                 'actions' => array(
@@ -63,15 +56,11 @@ class OLTAdmin extends BaseAdmin
     {
         $formMapper
             ->add('name')
-            ->add('mark')
+            ->add('model')
             ->add('ip')
             ->add('snmpCommunity')
             ->add('sshUser')
             ->add('sshPass')
-            ->add('firmware')
-            ->add('libraryVersion')
-            ->add('executeSnmp')
-            ->add('model')
         ;
     }
 
@@ -82,15 +71,11 @@ class OLTAdmin extends BaseAdmin
     {
         $showMapper
             ->add('name')
-            ->add('mark')
+            ->add('model')
             ->add('ip')
             ->add('snmpCommunity')
             ->add('sshUser')
             ->add('sshPass')
-            ->add('firmware')
-            ->add('libraryVersion')
-            ->add('executeSnmp')
-            ->add('model')
         ;
     }
 }

src/FTTHBundle/Admin/OLTModelAdmin.php

@@ -17,7 +17,7 @@ class OLTModelAdmin extends BaseAdmin
     {
         $datagridMapper
             ->add('name')
-            ->add('workflow')
+            ->add('props')
         ;
     }
 
@@ -28,7 +28,7 @@ class OLTModelAdmin extends BaseAdmin
     {
         $listMapper
             ->add('name')
-            ->add('workflow')
+            ->add('props')
             ->add('_action', null, array(
                 'actions' => array(
                     'show' => array(),
@@ -46,7 +46,7 @@ class OLTModelAdmin extends BaseAdmin
     {
         $formMapper
             ->add('name')
-            ->add('workflow')
+            ->add('props')
         ;
     }
 
@@ -57,7 +57,7 @@ class OLTModelAdmin extends BaseAdmin
     {
         $showMapper
             ->add('name')
-            ->add('workflow')
+            ->add('props')
         ;
     }
 }

src/FTTHBundle/Admin/ONUAdmin.php

@@ -17,15 +17,14 @@ class ONUAdmin extends BaseAdmin
     protected function configureDatagridFilters(DatagridMapper $datagridMapper)
     {
         $datagridMapper
-            ->add('ip')
-            ->add('mac')
-            ->add('serialNumber')
-            ->add('ponSerialNumber')
             ->add('clientId')
-            ->add('olt')
-            ->add('model')
-            ->add('node')
+            ->add('ponSerialNumber')
             ->add('profile')
+            ->add('node')
+            ->add('model')
+            ->add('serialNumber')
+            ->add('mac')
+            ->add('olt')
         ;
     }
 
@@ -35,13 +34,15 @@ class ONUAdmin extends BaseAdmin
     protected function configureListFields(ListMapper $listMapper)
     {
         $listMapper
+	    ->add('clientId')
             ->add('ip')
             ->add('mac')
             ->add('serialNumber')
             ->add('ponSerialNumber')
-            ->add('clientId')
-            ->add('olt')
+            ->add('profile')
+            ->add('node')
             ->add('model')
+            ->add('olt')
             ->add('workflow')
             ->add('currentState','string', array('template' => 'WorkflowBundle:Workflow:base_list_field_current_state.html.twig'))
             ->add('_action', null, array(
@@ -61,15 +62,15 @@ class ONUAdmin extends BaseAdmin
     protected function configureFormFields(FormMapper $formMapper)
     {
         $formMapper
-            ->add('ip')
-            ->add('mac')
-            ->add('serialNumber')
+	    ->add('clientId')
             ->add('ponSerialNumber')
-            ->add('clientId')
-            ->add('olt')
-            ->add('model')
-            ->add('node')
             ->add('profile')
+            ->add('node')
+            ->add('model')
+            ->add('serialNumber')
+            ->add('mac')
+            ->add('olt')
+         
         ;
     }
 
@@ -80,16 +81,15 @@ class ONUAdmin extends BaseAdmin
     {
         $showMapper
             ->add('id')
-            ->add('ip')
-            ->add('mac')
-            ->add('serialNumber')
+	    ->add('clientId')
             ->add('ponSerialNumber')
-            ->add('clientId')
-            ->add('olt')
+            ->add('profile')
+            ->add('node')
             ->add('model')
+            ->add('serialNumber')
+            ->add('mac')
+            ->add('olt')
             ->add('model.workflow')
-            ->add('node')
-            ->add('profile')
             ->add('currentState')
             ->add('log','string', array('template' => 'FTTHBundle:ONU:show_log.html.twig'))
         ;

src/FTTHBundle/Entity/OLT.php

@@ -29,13 +29,6 @@ class OLT
      */
     protected $name;
 
-    /**
-     * @var string $mark
-     *
-     * @ORM\Column(type="string", length=255, nullable=true, unique=false)
-     */
-    protected $mark;
-
     /**
      * @var string $ip
      * 
@@ -65,13 +58,6 @@ class OLT
      */
     protected $sshPass;
 
-    /**
-     * @var string $firmware
-     *
-     * @ORM\Column(type="string", length=255, nullable=true, unique=false)
-     */
-    protected $firmware;
-
     /**
      * @var string $libraryVersion
      *
@@ -79,13 +65,6 @@ class OLT
      */
     protected $libraryVersion;
 
-    /**
-     * @var boolean $executeSnmp
-     * 
-     * @ORM\Column(type="boolean", nullable=true, options={"default":true})
-     */
-    protected $executeSnmp = true;
-    
     /**
      * @ORM\ManyToOne(targetEntity="OLTModel", inversedBy="olts", fetch="EXTRA_LAZY")
      * @ORM\JoinColumn(name="model_id", referencedColumnName="id", onDelete="SET NULL")
@@ -139,14 +118,6 @@ class OLT
         return $this->name;
     }
 
-    /**
-     * @return string
-     */
-    public function getMark()
-    {
-        return $this->mark;
-    }
-
     /**
      * @return string
      */
@@ -179,30 +150,6 @@ class OLT
         return $this->sshPass;
     }
 
-    /**
-     * @return string
-     */
-    public function getFirmware()
-    {
-        return $this->firmware;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLibraryVersion()
-    {
-        return $this->libraryVersion;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getExecuteSnmp()
-    {
-        return $this->executeSnmp;
-    }
-
     /**
      * @return int
      */
@@ -222,17 +169,6 @@ class OLT
         return $this;
     }
 
-    /**
-     * @param string $mark
-     * @return $this
-     */
-    public function setMark($mark)
-    {
-        $this->mark = $mark;
-
-        return $this;
-    }
-
     /**
      * @param string $ip
      * @return $this
@@ -277,39 +213,6 @@ class OLT
         return $this;
     }
 
-    /**
-     * @param string $firmware
-     * @return $this
-     */
-    public function setFirmware($firmware)
-    {
-        $this->firmware = $firmware;
-
-        return $this;
-    }
-
-    /**
-     * @param string $libraryVersion
-     * @return $this
-     */
-    public function setLibraryVersion($libraryVersion)
-    {
-        $this->libraryVersion = $libraryVersion;
-
-        return $this;
-    }
-
-    /**
-     * @param boolean $executeSnmp
-     * @return $this
-     */
-    public function setExecuteSnmp($executeSnmp)
-    {
-        $this->executeSnmp = $executeSnmp;
-
-        return $this;
-    }
-    
     /**
      * @param ONU $onu
      * @return OLT
@@ -394,12 +297,12 @@ class OLT
 
     public function getWorkflowObject() 
     {
-        if($this->model) {
-            $model = $this->model;
-            if($model->getWorkflow()) {
-                return $model->getWorkflow();
-            }
-        }
+        //if($this->model) {
+        //    $model = $this->model;
+        //    if($model->getWorkflow()) {
+        //        return $model->getWorkflow();
+        //    }
+        //}
 
         return null;
     }
@@ -448,5 +351,4 @@ class OLT
     {
         return "transition_state";
     }
-
 }

src/FTTHBundle/Entity/OLTModel.php

@@ -35,10 +35,9 @@ class OLTModel
     protected $olts;
 
     /**
-     * @ORM\ManyToOne(targetEntity="\WorkflowBundle\Entity\Workflow", fetch="EXTRA_LAZY")
-     * @ORM\JoinColumn(name="workflow_id", referencedColumnName="id", onDelete="SET NULL")
+     * @ORM\Column(type="text", nullable=true)
      */
-    protected $workflow;
+    protected $props;
 
 
     /**
@@ -110,20 +109,20 @@ class OLTModel
     }
 
     /**
-     * @return OLTModel
+     * @return String
      */
-    public function getWorkflow()
+    public function getProps()
     {
-        return $this->workflow;
+        return $this->props;
     }
 
     /**
-     * @param Workflow $workflow
+     * @param String $props
      * @return $this
      */
-    public function setWorkflow($workflow)
+    public function setProps($props)
     {
-        $this->workflow = $workflow;
+        $this->props = $props;
         
         return $this;
     }