Commit 161cbd3d authored by garciaale's avatar garciaale
Browse files

Merges master branch again into sol006

parents 5d07ce83 8bc30d96

nscharm_ns/nscharm_nsd.yaml

+24 −1
Original line number Diff line number Diff line
@@ -24,6 +24,29 @@ nsd: 
    virtual-link-desc:

    - id: mgmtnet

      mgmt-network: 'true'

      vim-network-name: mgmt

    vnfd-id:

    - nscharm-policy-vnf

    - nscharm-user-vnf

    - nscharm-policy-vnf

    ns-configuration:

      juju:

        charm: ns

      initial-config-primitive:

      - seq: '1'

        name: config

        parameter:

        # Configure Juju credentials

        - name: juju-username

          value: 'admin'

        - name: juju-password

          value: 'd55ce8ab4efa59e7f1b865bce53f55ed'

      - seq: '2'

        name: add-user

        parameter:

        - name: username

          value: root

      config-primitive:

      - name: add-user

        parameter:

        - name: username

          data-type: STRING

vdu_replicas_ns/icons/osm.png

0 → 100644
+54.6 KiB
Loading image diff...

vdu_replicas_ns/vdu_replicas_nsd.yaml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
nsd:

  nsd:

  - description: NS with 2 VNFs connected by datanet and mgmtnet VLs

    df:

    - id: default-df

      vnf-profile:

      - id: vnf1

        virtual-link-connectivity:

        - constituent-cpd-id:

          - constituent-base-element-id: vnf1

            constituent-cpd-id: vnf-mgmt-ext

          virtual-link-profile-id: mgmtnet

        - constituent-cpd-id:

          - constituent-base-element-id: vnf1

            constituent-cpd-id: vnf-data-ext

          virtual-link-profile-id: datanet

        vnfd-id: vdu-replicas-vnf

      - id: vnf2

        virtual-link-connectivity:

        - constituent-cpd-id:

          - constituent-base-element-id: vnf2

            constituent-cpd-id: vnf-mgmt-ext

          virtual-link-profile-id: mgmtnet

        - constituent-cpd-id:

          - constituent-base-element-id: vnf2

            constituent-cpd-id: vnf-data-ext

          virtual-link-profile-id: datanet

        vnfd-id: vdu-replicas-vnf

    id: vdu-replicas-ns

    name: vdu-replicas-ns

    version: '1.0'

    virtual-link-desc:

    - id: mgmtnet

      mgmt-network: true

    - id: datanet

    vnfd-id:

    - vdu-replicas-vnf

vdu_replicas_vnf/cloud_init/cloud-config.txt

0 → 100755
+30 −0
Original line number Diff line number Diff line 
#cloud-config

password: osm4u

chpasswd: { expire: False }

ssh_pwauth: True



write_files:

-   content: |

        # Example of jinja2 template for parsing OSM variables



        I am vdu_id='{{ OSM.vdu_id }}' count_index='{{ OSM.count_index }}' ip_address='{{ OSM.ip_address|default('not set') }}'

        Parameters:

         ns_id: {{ OSM.ns_id }}

         vnf_id: {{ OSM.vnf_id }}

         member_vnf_index: {{ OSM.member_vnf_index }}

         list of vdus:{% for vdu_id_index,vdu in OSM.vdu.items() %}

          vdu {{ vdu_id_index }}:

            vdu_id: {{ vdu.vdu_id }}

            count_index: {{ vdu.count_index }}

            ip_address: {{ vdu.ip_address|default('not set') }}

            interfaces:{% for iface_id,iface in vdu.interfaces.items() %}

              iface='{{ iface_id }}' ip_address='{{ iface.ip_address|default('no ip') }} mac_adress={{ iface.mac_address|default('no mac') }}'{% endfor %}

        {% endfor %}



        global variable OSM:

        """{{ OSM|default('OSM variable is not defined') }}"""



    owner: ubuntu:ubuntu

    permissions: '0644'

    path: /home/ubuntu/helloworld.txt

vdu_replicas_vnf/icons/osm.png

0 → 100644
+54.6 KiB
Loading image diff...