Commit 1bba97bb authored by garciadeblas's avatar garciadeblas
Browse files

Merge remote-tracking branch 'origin/master' into azure-alternative-images 



Signed-off-by: default avatargarciadeblas <gerardo.garciadeblas@telefonica.com>
parents d3aeeab5 5fe32766

.gitlab-ci.yml

+14 −10
Original line number Diff line number Diff line
@@ -10,17 +10,19 @@ publish-repository: 
    - git submodule update

    - python3 -m pip install wheel pyang pyangbind

    - git clone https://osm.etsi.org/gerrit/osm/IM.git

    - pip3 install -r IM/requirements.txt

    - pip3 install IM/

    - git clone https://osm.etsi.org/gerrit/osm/osmclient.git

    - pip3 install -r osmclient/requirements.txt

    - pip3 install osmclient/

    - rm -rf osmclient/ IM/

    - mv magma/* .

    - mv charm-packages/* .

    - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm -vvv repo-index --origin . --destination vnf-catalog

    - |

        sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P 29419 osmsupport@vnf-catalog.etsi.org << EOF

          put -r vnf-catalog/* Testing

        EOF

    # - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm -vvv repo-index --origin . --destination vnf-catalog

    # - |

    #     sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P 29419 osmsupport@vnf-catalog.etsi.org << EOF

    #       put -r vnf-catalog/* Testing

    #     EOF

  rules:

    - if: '$CI_COMMIT_REF_PROTECTED == "true"'

      when: on_success
@@ -38,17 +40,19 @@ build-local-repository: 
    - git submodule update

    - python3 -m pip install wheel pyang pyangbind

    - git clone https://osm.etsi.org/gerrit/osm/IM.git

    - pip3 install -r IM/requirements.txt

    - pip3 install IM/

    - git clone https://osm.etsi.org/gerrit/osm/osmclient.git

    - pip3 install -r osmclient/requirements.txt

    - pip3 install osmclient/

    - rm -rf osmclient/ IM/

    - mv magma/* .

    - mv charm-packages/* .

    - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm -vvv repo-index --origin . --destination vnf-catalog

    - |

        sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P 29419 osmsupport@vnf-catalog.etsi.org << EOF

          put -r vnf-catalog/* Testing/Premerge

        EOF

    # - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm -vvv repo-index --origin . --destination vnf-catalog

    # - |

    #     sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P 29419 osmsupport@vnf-catalog.etsi.org << EOF

    #       put -r vnf-catalog/* Testing/Premerge

    #     EOF

  rules:

    - if: '$CI_COMMIT_REF_PROTECTED == "false"'

      when: on_success

charm-packages/native_charm_centos_ns/icons/osm.png

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

charm-packages/native_charm_centos_ns/native_charm_centos_nsd.yaml

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

  nsd:

  - description: NS with 1 VNF with cloudinit and charm for centos

    df:

    - id: default-df

      vnf-profile:

      - id: '1'

        virtual-link-connectivity:

        - constituent-cpd-id:

          - constituent-base-element-id: '1'

            constituent-cpd-id: vnf-mgmt-ext

          virtual-link-profile-id: mgmtnet

        vnfd-id: native_charm_centos-vnf

    id: native_charm_centos-ns

    name: native_charm_centos-ns

    version: '1.0'

    virtual-link-desc:

    - id: mgmtnet

      mgmt-network: 'true'

    - id: datanet

    vnfd-id:

    - native_charm_centos-vnf

charm-packages/native_charm_centos_vnf/charms/ops/simple/actions.yaml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
##

# Copyright 2020 Canonical Ltd.

# All rights reserved.

#

# Licensed under the Apache License, Version 2.0 (the "License"); you may

# not use this file except in compliance with the License. You may obtain

# a copy of the License at

#

#         http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

# License for the specific language governing permissions and limitations

# under the License.

##

touch:

  description: "Touch a file on the VNF."

  params:

    filename:

      description: "The name of the file to touch."

      type: string

      default: ""

  required:

    - filename

charm-packages/native_charm_centos_vnf/charms/ops/simple/config.yaml

0 → 100644
+17 −0
Original line number Diff line number Diff line 
##

# Copyright 2020 Canonical Ltd.

# All rights reserved.

#

# Licensed under the Apache License, Version 2.0 (the "License"); you may

# not use this file except in compliance with the License. You may obtain

# a copy of the License at

#

#         http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

# License for the specific language governing permissions and limitations

# under the License.

##

options: {}
 
 No newline at end of file