Commit ac85abe8 authored by lavado's avatar lavado
Browse files

adding test subscriber to Orc8r HSS as Day-1

parent 60f489d9
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -55,6 +55,17 @@ del-gw:
      description: "Orchestrator Network"
      type: "string"
      default: ""
add-test-subscriber:
  description: "Adds test subscriber to Orc8r HSS"
  params:
    orch_ip:
      description: "Orchestrator IP"
      type: "string"
      default: ""
    orch_net:
      description: "Orchestrator Network"
      type: "string"
      default: ""

# Standard OSM functions
start:
+17 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ class SimpleHAProxyCharm(CharmBase):
            self.on.restart_magma_action,
            self.on.del_gw_action,
            self.on.reset_id_action,
            self.on.add_test_subscriber_action,
            # OSM actions (primitives)
            self.on.start_action,
            self.on.stop_action,
@@ -252,6 +253,22 @@ class SimpleHAProxyCharm(CharmBase):
            event.fail("Unit is not leader")
            return

    def on_add_test_subscriber_action(self, event):
        """Adds test subscriber to Orc8r HSS"""
        if self.is_leader:
            orch_ip = event.params["orch_ip"]
            orch_net = event.params["orch_net"]
            proxy = self.get_ssh_proxy()
            stdout, stderr = proxy.run(
                "/home/magma/addtestsub.py --orch_ip {} --orch_net {}".format(
                    orch_ip, orch_net
                )
            )
            event.set_results({"output": stdout, "stderr": stderr})
        else:
            event.fail("Unit is not leader")
            return

    def on_upgrade_charm(self, event):
        """Upgrade the charm."""
        unit = self.model.unit
+11 −4
Original line number Diff line number Diff line
@@ -166,11 +166,18 @@ vnfd:vnfd-catalog:
              -  name: orch_net
                 value: <orch_net>
           -  seq: '5'
              name: add-hosts
              name: add-test-subscriber
              parameter:
              -  name: orch_ip
                 value: <orch_ip>
              -  name: orch_net
                 value: <orch_net>
           -  seq: '6'
              name: add-hosts
              parameter:
              -  name: orch_ip
                 value: <orch_ip>
           -  seq: '7'
              name: restart-magma 
           config-primitive:
             -  name: add-gw